[PATCH 2/2] powerpc: If kexec_build_elf_info() fails return immediately from elf64_load()
Michael Ellerman
mpe at ellerman.id.au
Wed Apr 21 17:21:26 AEST 2021
Lakshmi Ramasubramanian <nramas at linux.microsoft.com> writes:
> Uninitialized local variable "elf_info" would be passed to
> kexec_free_elf_info() if kexec_build_elf_info() returns an error
> in elf64_load().
>
> If kexec_build_elf_info() returns an error, return the error
> immediately.
>
> Signed-off-by: Lakshmi Ramasubramanian <nramas at linux.microsoft.com>
> Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
Reviewed-by: Michael Ellerman <mpe at ellerman.id.au>
cheers
> diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c
> index 02662e72c53d..eeb258002d1e 100644
> --- a/arch/powerpc/kexec/elf_64.c
> +++ b/arch/powerpc/kexec/elf_64.c
> @@ -45,7 +45,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
>
> ret = kexec_build_elf_info(kernel_buf, kernel_len, &ehdr, &elf_info);
> if (ret)
> - goto out;
> + return ERR_PTR(ret);
>
> if (image->type == KEXEC_TYPE_CRASH) {
> /* min & max buffer values for kdump case */
> --
> 2.31.0
More information about the Linuxppc-dev
mailing list