Re: [PATCH] x86/module: remove unnecessary check in module_finalize()

[Song Liu]

On Wed, Feb 19, 2025 at 5:48 AM Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
>
> The "calls" pointer can no longer be NULL after commit ab9fea59487d
> ("x86/alternative: Simplify callthunk patching") was merged.  Delete
> this unnecessary check.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

Acked-by: Song Liu <song@xxxxxxxxxx>

> ---
>  arch/x86/kernel/module.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
> index cb9d295e67cb..615f74c4bd6c 100644
> --- a/arch/x86/kernel/module.c
> +++ b/arch/x86/kernel/module.c
> @@ -278,10 +278,8 @@ int module_finalize(const Elf_Ehdr *hdr,
>         if (calls) {
>                 struct callthunk_sites cs = {};
>
> -               if (calls) {
> -                       cs.call_start = (void *)calls->sh_addr;
> -                       cs.call_end = (void *)calls->sh_addr + calls->sh_size;
> -               }
> +               cs.call_start = (void *)calls->sh_addr;
> +               cs.call_end = (void *)calls->sh_addr + calls->sh_size;
>
>                 callthunks_patch_module_calls(&cs, me);
>         }
> --
> 2.47.2
>