From: Catalin Marinas <catalin.marinas@arm.com>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Cc: dan.carpenter@oracle.com, robh@kernel.org, will@kernel.org,
kbuild@lists.01.org, lkp@intel.com, kbuild-all@lists.01.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, bauerman@linux.ibm.com,
qiuguorui1@huawei.com
Subject: Re: [PATCH] arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()
Date: Thu, 9 Dec 2021 09:08:21 +0000 [thread overview]
Message-ID: <YbHHhRnpR/EtSV3f@arm.com> (raw)
In-Reply-To: <20211209004522.91926-1-nramas@linux.microsoft.com>
On Wed, Dec 08, 2021 at 04:45:22PM -0800, Lakshmi Ramasubramanian wrote:
> 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.
>
> 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()")
> ---
> 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;
> }
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.
--
Catalin
next prev parent reply other threads:[~2021-12-09 9:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 0:45 [PATCH] arm64: kexec: Fix missing error code 'ret' warning in load_other_segments() Lakshmi Ramasubramanian
2021-12-09 9:08 ` Catalin Marinas [this message]
2021-12-09 16:32 ` Lakshmi Ramasubramanian
2021-12-10 1:01 Lakshmi Ramasubramanian
2021-12-13 16:42 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YbHHhRnpR/EtSV3f@arm.com \
--to=catalin.marinas@arm.com \
--cc=bauerman@linux.ibm.com \
--cc=dan.carpenter@oracle.com \
--cc=kbuild-all@lists.01.org \
--cc=kbuild@lists.01.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=nramas@linux.microsoft.com \
--cc=qiuguorui1@huawei.com \
--cc=robh@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).