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

Lakshmi Ramasubramanian nramas at linux.microsoft.com
Thu Dec 9 08:32:59 PST 2021


Hi Catalin,

On Thu, 2021-12-09 at 09:08 +0000, Catalin Marinas wrote:
> On Wed, Dec 08, 2021 at 04:45:22PM -0800, Lakshmi Ramasubramanian
> wrote:
> > 
> > Set return code to -ENOMEM if of_kexec_alloc_and_setup_fdt()
> > returns
> > NULL dtb.
> > 
> > 
> > @@ -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.

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

thanks,
 -lakshmi





More information about the linux-arm-kernel mailing list