Check for if the kcalloc() fails.
Cc: stable@vger.kernel.org Fixes: 6e977eaa8280 ("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 --- v3: Update fixes tag v2: I don't think anything changed in v2? Added tags?
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';
On Fri, 2022-05-20 at 09:45 +0300, Dan Carpenter wrote:
Check for if the kcalloc() fails.
Cc: stable@vger.kernel.org Fixes: 6e977eaa8280 ("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
v3: Update fixes tag v2: I don't think anything changed in v2? Added tags?
[]
diff --git 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;
trivia:
Not sure the kcalloc(1. ..) is useful.
It might be simpler using kzalloc, though given the memcpy_fromio below a kcalloc/kzalloc seems dubious and kmalloc could be used.
memcpy_fromio(data, priv->base, len); data[len - 1] = '\0';
linux-stable-mirror@lists.linaro.org