Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3358913pxb; Mon, 17 Jan 2022 18:32:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxeLuXdnZOHWzIfS0bZ5jvOtT+/9VK7Da+y8J3ueSA6NBw17FLtVSDxBEZJZju3MVl6JfEe X-Received: by 2002:a65:610b:: with SMTP id z11mr11067846pgu.205.1642473134644; Mon, 17 Jan 2022 18:32:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642473134; cv=none; d=google.com; s=arc-20160816; b=lelNebnhT72hCRUIvDxhdfQ1miQQ6J9uC3eanjYniBkKJ65WHNpLX4+IZ3y0uNyuSW 7+iyOmL/cCkRuR2LeS0z6sbMoqmijyQUODWbt9T6e1N4TzZv29+l+D0RnAkD9vew8eBF 9/mgiRUqywWVbUER+DJjpsag2Fmh513SqEawlubGuEkm/IYpfFFfocdMrLVPIqEOBtqA izZKtCALYgddSi/bDWwLu1019t3ipU8G/G0WxL5YnLUMLNt7Iv/FttL2HVRwxMuUY/35 aW43S6oCuCNM7J1a5P46NSpAZEMwW33Md9ZX9Ws2pYgmrL+D0t7lVB3NEbNPyr/ZUDEC wcyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=F+uGYHDoEilEiMDns/lgpJ09F6zIQYXURXhRR1id3TM=; b=t6wKq4ti3KjHretg75ttFq4jvl2AD7ruPcPINH+y8dYlEo30gQtYUS68XO31OINqFJ 2tXmXhTJY8ba/AxyfUm8oAcv7s5agwyY5Dn9HD4m8gnLcyrt1wk+LRs3Zgobpz4oBJ9M ZLIGBhtueP6y8SJBhD6KQoXPRdKoXPkXBFgKasYnceEB/E+PvDKFTxGvomruuv37LHPi XC8zv8BEPjVUnf6VJvQx41yLkzsh5r8F/dnahLOApDth7gKp7F1b2bSrkf6B18CMfhbs psvnzy7XSwBNBAUU0U7ezpOoDeAtyyg0ZliccKgh/O6wqUCQNgGryIQfV+GVLHlwYqdq xKeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=marcan.st Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z9si7405670pgu.473.2022.01.17.18.32.06; Mon, 17 Jan 2022 18:32:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239524AbiAQOam (ORCPT + 70 others); Mon, 17 Jan 2022 09:30:42 -0500 Received: from marcansoft.com ([212.63.210.85]:55812 "EHLO mail.marcansoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239105AbiAQOak (ORCPT ); Mon, 17 Jan 2022 09:30:40 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: hector@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id 0029442137; Mon, 17 Jan 2022 14:30:30 +0000 (UTC) From: Hector Martin To: Kalle Valo , "David S. Miller" , Jakub Kicinski , Rob Herring , "Rafael J. Wysocki" , Len Brown , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Dmitry Osipenko Cc: Hector Martin , Sven Peter , Alyssa Rosenzweig , Mark Kettenis , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Pieter-Paul Giesberts , Linus Walleij , Hans de Goede , "John W. Linville" , "brian m. carlson" , Andy Shevchenko , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com Subject: [PATCH v3 2/9] brcmfmac: firmware: Allocate space for default boardrev in nvram Date: Mon, 17 Jan 2022 23:29:12 +0900 Message-Id: <20220117142919.207370-3-marcan@marcan.st> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220117142919.207370-1-marcan@marcan.st> References: <20220117142919.207370-1-marcan@marcan.st> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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") Signed-off-by: Hector Martin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index 0eb13e5df517..1001c8888bfe 100644 --- 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(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); -- 2.33.0