提交 8fe8772d 编写于 作者: H Hector Martin 提交者: Zheng Zengkai

brcmfmac: firmware: Allocate space for default boardrev in nvram

stable inclusion
from stable-v5.10.110
commit daa07f29027c85f344f31c143d9c22ef299a31ff
bugzilla: https://gitee.com/openeuler/kernel/issues/I574AL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=daa07f29027c85f344f31c143d9c22ef299a31ff

--------------------------------

commit d19d8e3b upstream.

If boardrev is missing from the NVRAM we add a default one, but this
might need more space in the output buffer than was allocated. Ensure
we have enough padding for this in the buffer.

Fixes: 46f2b38a ("brcmfmac: insert default boardrev in nvram data if missing")
Reviewed-by: NArend van Spriel <arend.vanspriel@broadcom.com>
Cc: stable@vger.kernel.org
Signed-off-by: NHector Martin <marcan@marcan.st>
Reviewed-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: NKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220131160713.245637-3-marcan@marcan.stSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 663cd671
...@@ -207,6 +207,8 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp, ...@@ -207,6 +207,8 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
size = BRCMF_FW_MAX_NVRAM_SIZE; size = BRCMF_FW_MAX_NVRAM_SIZE;
else else
size = data_len; size = data_len;
/* Add space for properties we may add */
size += strlen(BRCMF_FW_DEFAULT_BOARDREV) + 1;
/* Alloc for extra 0 byte + roundup by 4 + length field */ /* Alloc for extra 0 byte + roundup by 4 + length field */
size += 1 + 3 + sizeof(u32); size += 1 + 3 + sizeof(u32);
nvp->nvram = kzalloc(size, GFP_KERNEL); nvp->nvram = kzalloc(size, GFP_KERNEL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册