Skip to contentSkip to conversation

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

PATCH In review Lakshmi Ramasubramanian 2 participants 2 messages Dec 8, 2021 arm64

lore
Share & tools
lore
#0 lore raw

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

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.

---
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(+)
arch/arm64/kernel/machine_kexec_file.c +1 -0
index 63634b4d72c1..04d072885e64 100644
@@ -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;
 	}
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 1 line · Lakshmi Ramasubramanian

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:

Quoted 11 lines

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.

Fixes ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()")
Quoted 22 lines

---
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(+)
arch/arm64/kernel/machine_kexec_file.c +1 -1
index 63634b4d72c1..04d072885e64 100644
@@ -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