summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/machine_kexec_file.c
diff options
context:
space:
mode:
authorLakshmi Ramasubramanian <nramas@linux.microsoft.com>2021-12-10 04:01:21 +0300
committerCatalin Marinas <catalin.marinas@arm.com>2021-12-16 20:44:58 +0300
commit9c5d89bc10551f1aecd768b00fca3339a7b8c8ee (patch)
treedbefcc5f79ca9d8d1c53b07ff5fd7bfced44468f /arch/arm64/kernel/machine_kexec_file.c
parent35b6b28e69985eafb20b3b2c7bd6eca452b56b53 (diff)
downloadlinux-9c5d89bc10551f1aecd768b00fca3339a7b8c8ee.tar.xz
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 -EINVAL if of_kexec_alloc_and_setup_fdt() returns NULL dtb. Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()") Link: https://lore.kernel.org/r/20211210010121.101823-1-nramas@linux.microsoft.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/machine_kexec_file.c')
-rw-r--r--arch/arm64/kernel/machine_kexec_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 63634b4d72c1..59c648d51848 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 = -EINVAL;
goto out_err;
}