From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 581033BB117; Tue, 12 May 2026 17:53:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608435; cv=none; b=SQAML83pdXBQJL906nNg/htv3IudQvV1OUgTN0PCQ9vOUWrHQZhPBfW697nKRaVY/yqwSuG0EilZavdOQH/nSGwZOZ9ttheViB9WPFguJK7RP4E1mDsiJpPSZbZ8sCqhBC0mYyK1EYv5kE3VO6WvRdHHdtPzLl7B1PMcAaTGUdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608435; c=relaxed/simple; bh=VSSB+6GqzVupifDikb97sFcYd4Sg+6foW/2Hx1fD5U4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r4gtpAMNkNZz88iwL1LPI9Gm8Fl5NmU6mrwd/xZou5Br/Nepcq7TTELgXuPd+IwwvyTANhUCSCLSucOBUYzm+Gbyd9AFoiCl3Uw6UIKQheg17EVjfJqShEgj4w+WsnEbFq3HU5ZqLBcM5m/8uJ25pHQcpGru9meUV3m0Wy+CBCA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=l6hHqnbQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="l6hHqnbQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1B19C2BCB0; Tue, 12 May 2026 17:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608435; bh=VSSB+6GqzVupifDikb97sFcYd4Sg+6foW/2Hx1fD5U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l6hHqnbQCmcpcVnivF6l78ijzwQLeivQ4CMrt/cqaFEcjVDJbVRoYvN92QIx5EuGk FDw8R47u2A8iB8N8vxPmS1TUssnLSsjZ4kZMadbtVqxu4cYSCzjoLuESOnmTtGtrgE zR2pWtg7GFwgrC2YYoIZgHXnPtl/UeU8gRzFlIA4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jonas Gorski , =?UTF-8?q?Michael=20B=C3=BCsch?= , Tristan Madani , Johannes Berg Subject: [PATCH 6.18 036/270] wifi: b43: enforce bounds check on firmware key index in b43_rx() Date: Tue, 12 May 2026 19:37:17 +0200 Message-ID: <20260512173939.215947983@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tristan Madani commit 1f4f78bf8549e6ac4f04fba4176854f3a6e0c332 upstream. The firmware-controlled key index in b43_rx() can exceed the dev->key[] array size (58 entries). The existing B43_WARN_ON is non-enforcing in production builds, allowing an out-of-bounds read. Make the B43_WARN_ON check enforcing by dropping the frame when the firmware returns an invalid key index. Suggested-by: Jonas Gorski Acked-by: Michael Büsch Fixes: e4d6b7951812 ("[B43]: add mac80211-based driver for modern BCM43xx devices") Cc: stable@vger.kernel.org Signed-off-by: Tristan Madani Link: https://patch.msgid.link/20260417111145.2694196-1-tristmd@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/broadcom/b43/xmit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/broadcom/b43/xmit.c +++ b/drivers/net/wireless/broadcom/b43/xmit.c @@ -702,7 +702,8 @@ void b43_rx(struct b43_wldev *dev, struc * key index, but the ucode passed it slightly different. */ keyidx = b43_kidx_to_raw(dev, keyidx); - B43_WARN_ON(keyidx >= ARRAY_SIZE(dev->key)); + if (B43_WARN_ON(keyidx >= ARRAY_SIZE(dev->key))) + goto drop; if (dev->key[keyidx].algorithm != B43_SEC_ALGO_NONE) { wlhdr_len = ieee80211_hdrlen(fctl);