Skip to contentSkip to conversation

arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()

Since commit ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()"), smatch reports the following warning:

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.

Fixes ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()")

---
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
maintainer
#1 lore raw
Quoted 30 lines · Lakshmi Ramasubramanian

Since commit ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()"), smatch reports the following warning:

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.

Fixes ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()")

---
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 +0 -0
index 63634b4d72c1..04d072885e64 100644

arch/arm64/kernel/machine_kexec_file.c int load_other_segments(struct kimage *image, · line 154

Quoted 6 lines
arch/arm64/kernel/machine_kexec_file.c +1 -0
@@ -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;
 	}

Above the 'if' block we have:

	dtb = of_kexec_alloc_and_setup_fdt(image, initrd_load_addr,
					   initrd_len, cmdline, 0);

Looking at this function, it has several ways to fail, not just on allocation. However, we assume above that it's always -ENOMEM. We could do like powerpc and use -EINVAL as more likely than allocation failure or change of_kexec_alloc_and_setup_fdt() to return ERR_PTR() and we use that. The latter would be my preferred option, though it probably doesn't matter much. The second best would be -EINVAL.

Signature · 1 line
Catalin
#2 lore raw

Hi Catalin,

Quoted 21 lines · Catalin Marinas

arch/arm64/kernel/machine_kexec_file.c int load_other_segments(struct kimage *image, · line 154

Quoted 13 lines · Lakshmi Ramasubramanian

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

arch/arm64/kernel/machine_kexec_file.c +1 -0
@@ -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;
 	}

Above the 'if' block we have:

	dtb = of_kexec_alloc_and_setup_fdt(image, initrd_load_addr,
					   initrd_len, cmdline, 0);
Quoted 9 lines

Looking at this function, it has several ways to fail, not just on allocation. However, we assume above that it's always -ENOMEM. We could
do like powerpc and use -EINVAL as more likely than allocation failure
or change of_kexec_alloc_and_setup_fdt() to return ERR_PTR() and we use
that. The latter would be my preferred option, though it probably doesn't matter much. The second best would be -EINVAL.

I'll change the error code to -EINVAL and post an updated patch.

thanks,
-lakshmi