From: Dan Carpenter <dan.carpenter@oracle.com>

Check for if the kcalloc() fails.

Cc: stable@vger.kernel.org
Fixes: 299dc152721f ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cells")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Hi Greg,

This is the only patch that was not applied cleanly to char-misc-testing due
some fixes that are already applied on the same file.
Rebased this and resending just this one.

Thanks,
--srini


 drivers/nvmem/brcm_nvram.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c
index 450b927691c3..48bb8c62cbbf 100644
--- a/drivers/nvmem/brcm_nvram.c
+++ b/drivers/nvmem/brcm_nvram.c
@@ -97,6 +97,8 @@ static int brcm_nvram_parse(struct brcm_nvram *priv)
 	len = le32_to_cpu(header.len);
 
 	data = kcalloc(1, len, GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
 	memcpy_fromio(data, priv->base, len);
 	data[len - 1] = '\0';
 
-- 
2.21.0

On Tue, May 10, 2022 at 10:35:40AM +0100, Srinivas Kandagatla wrote:
> From: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Check for if the kcalloc() fails.
> 
> Cc: stable@vger.kernel.org
> Fixes: 299dc152721f ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cells")

This isn't a commit in any tree that I can see, are you sure it is
correct?

thanks,

greg k-h

On 19/05/2022 17:56, Greg KH wrote:
> On Tue, May 10, 2022 at 10:35:40AM +0100, Srinivas Kandagatla wrote:
>> From: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> Check for if the kcalloc() fails.
>>
>> Cc: stable@vger.kernel.org
>> Fixes: 299dc152721f ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cells")
> 
> This isn't a commit in any tree that I can see, are you sure it is
> correct?
Looks like the commit is not correct,
It should be

Fixes: 6e977eaa8280 ("nvmem: brcm_nvram: parse NVRAM content into NVMEM 
cells")


Dan, can you send this with fix to Fixes tag?

--srini


> 
> thanks,
> 
> greg k-h

On Thu, May 19, 2022 at 06:03:56PM +0100, Srinivas Kandagatla wrote:
> 
> 
> On 19/05/2022 17:56, Greg KH wrote:
> > On Tue, May 10, 2022 at 10:35:40AM +0100, Srinivas Kandagatla wrote:
> > > From: Dan Carpenter <dan.carpenter@oracle.com>
> > > 
> > > Check for if the kcalloc() fails.
> > > 
> > > Cc: stable@vger.kernel.org
> > > Fixes: 299dc152721f ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cells")
> > 
> > This isn't a commit in any tree that I can see, are you sure it is
> > correct?
> Looks like the commit is not correct,
> It should be
> 
> Fixes: 6e977eaa8280 ("nvmem: brcm_nvram: parse NVRAM content into NVMEM
> cells")
> 
> 
> Dan, can you send this with fix to Fixes tag?

No problem.  Done.

The problem is that Fixes tags will change if you use email instead of
git pulls.  Or maybe someone used git and did a rebase?  The point is if
you just use git everywhere and don't rebase then the hashes are
immutable.

No stress though, we figured it out.

regards,
dan carpenter