kernel: backport NVMEM late fixes from v6.2
[openwrt/staging/hauke.git] / target / linux / generic / backport-5.10 / 812-v6.2-0007-nvmem-brcm_nvram-Add-check-for-kzalloc.patch
1 From b0576ade3aaf24b376ea1a4406ae138e2a22b0c0 Mon Sep 17 00:00:00 2001
2 From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
3 Date: Fri, 27 Jan 2023 10:40:06 +0000
4 Subject: [PATCH] nvmem: brcm_nvram: Add check for kzalloc
5
6 Add the check for the return value of kzalloc in order to avoid
7 NULL pointer dereference.
8
9 Fixes: 6e977eaa8280 ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cells")
10 Cc: stable@vger.kernel.org
11 Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
12 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
13 Link: https://lore.kernel.org/r/20230127104015.23839-2-srinivas.kandagatla@linaro.org
14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 ---
16 drivers/nvmem/brcm_nvram.c | 3 +++
17 1 file changed, 3 insertions(+)
18
19 --- a/drivers/nvmem/brcm_nvram.c
20 +++ b/drivers/nvmem/brcm_nvram.c
21 @@ -97,6 +97,9 @@ static int brcm_nvram_parse(struct brcm_
22 len = le32_to_cpu(header.len);
23
24 data = kzalloc(len, GFP_KERNEL);
25 + if (!data)
26 + return -ENOMEM;
27 +
28 memcpy_fromio(data, priv->base, len);
29 data[len - 1] = '\0';
30