Thread (1 message) 1 message, 1 author, 2021-12-08

Re: [PATCH] [kexec]: arch/arm64/kernel/machine_kexec_file.c:152 load_other_segments() warn: missing error code 'ret'

From: Rob Herring <robh@kernel.org>
Date: 2021-12-08 20:38:06
Also in: lkml, oe-kbuild-all

On Wed, Dec 8, 2021 at 11:09 AM Lakshmi Ramasubramanian
[off-list ref] wrote:
Please use get_maintainers.pl so the right people are Cc'ed. In this
case being in arch/arm64, it needs to go to Will and Catalin and
lakml. They will need to apply this.

The subject and commit message needs some work. Something like:

arm64: kexec: Fix smatch 'ret' warning in load_other_segments()

Since commit ac10be5cdbfa ("arm64: Use common
of_kexec_alloc_and_setup_fdt()"), smatch has a warning:

arch/arm64/kernel/machine_kexec_file.c:152 load_other_segments() warn:
missing error code 'ret'

...and then the rest:
Return code is not set to an error code in load_other_segments() when
of_kexec_alloc_and_setup_fdt() call returns a NULL dtb. This results
in status success (return code set to 0) being returned from
load_other_segments().

Set return code to -ENOMEM if of_kexec_alloc_and_setup_fdt() returns
NULL dtb.

Signed-off-by: Lakshmi Ramasubramanian <redacted>
Reported-by: kernel test robot <redacted>
Reported-by: Dan Carpenter <redacted>
Fixes: ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()")
quoted hunk
---
Patch created in dt/next branch in git repo
https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

 arch/arm64/kernel/machine_kexec_file.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 63634b4d72c1..04d072885e64 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -149,6 +149,7 @@ int load_other_segments(struct kimage *image,
                                           initrd_len, cmdline, 0);
        if (!dtb) {
                pr_err("Preparing for new dtb failed\n");
+               ret = -ENOMEM;
                goto out_err;
        }

--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help