| Message ID | 20210420190355.10059-2-nramas@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] powerpc: Free fdt on error in elf64_load() | expand |
| Related | show |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (40f5c8e99b3f2f53db08055f415af2aac416360e) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (cbd3d5ba46b68c033986a6087209930f001cbcca) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (7af08140979a6e7e12b78c93b8625c8d25b084e2) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (791f9e36599d94af5a76d3f74d04e16326761aae) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (bf05bf16c76bb44ab5156223e1e58e26dfe30a88) |
Lakshmi Ramasubramanian <nramas@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@linux.microsoft.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Michael Ellerman <mpe@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
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 */
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@linux.microsoft.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> --- arch/powerpc/kexec/elf_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)