Commit 2c894b12 authored Feb 01, 2022 by Hector Martin Committed by Greg Kroah-Hartman Apr 15, 2022

brcmfmac: firmware: Allocate space for default boardrev in nvram



commit d19d8e3ba256f81ea4a27209dbbd1f0a00ef1903 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: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220131160713.245637-3-marcan@marcan.st


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 34a57be0

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,8 @@ static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
		size = BRCMF_FW_MAX_NVRAM_SIZE;
		else
		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 */
		size += 1 + 3 + sizeof(u32);
		nvp->nvram = kzalloc(size, GFP_KERNEL);