lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0190/1017] brcmfmac: firmware: Allocate space for default boardrev in nvram
    Date
    From: Hector Martin <marcan@marcan.st>

    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: 46f2b38a91b0 ("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>
    ---
    drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
    @@ -207,6 +207,8 @@ static int brcmf_init_nvram_parser(struc
    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);

    \
     
     \ /
      Last update: 2022-04-05 14:14    [W:2.532 / U:1.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site