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 A4A471A8F89; Sun, 26 Jan 2025 15:04:38 +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=1737903878; cv=none; b=JrLHYqX4pR4i8MVEcyKOXBwxVzkeRqGkjKUAkPphtqo5oGLvFmPexvnOPBqAJ3pAKeDjYCGbBRNsK2aeVdSmnE9/I/0Zqwy1VRV6mmGv0kRUDpetuiS8p26XhyNoBUJNeWUKFgi8VgY5pm23aF77FAgbL+ZSLVWg2cHFkxMfLcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903878; c=relaxed/simple; bh=rHa6Mj1eOZGznjcDsG5Hg7fGc0ElWRv/IgRiffMrrRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r0+5e5FczCKFdOhcvOKyXGmlEZqKA0TJ4UDTVvhiqTe0soetlrK/eKLrbmhhmRxBM/ByNmIJvgXUyf8kjRwg/sVHp/N9pwbsvJVbOXvz75dVvmxa54X/ahihKD7HvUOFgUaZp7oI6+qlkbLNvKbDfCve5aJQ2alR+bWdI+GiwKI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K3bl1UW4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K3bl1UW4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05572C4CED3; Sun, 26 Jan 2025 15:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903878; bh=rHa6Mj1eOZGznjcDsG5Hg7fGc0ElWRv/IgRiffMrrRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K3bl1UW4VsgW3rjEFwYVRZ1uyzAFdPX/wNo+Pj/jw/TGf0IN4SibI1PQJqwubVW1W ilRY9zAbSkRHggHptXPEpTuIZa5yxYnmm5HcmETt42v7tZuEpgBIiBdNM+GySQAvc4 RJRqvyfH7nEnpG8tg3T7DWH9gKSvXgIa8xXgd7rp4wWmsI+4jK0ivl2VchZEa4DtFt Vcr3UgQmQVunI+DxbZ4DaX9UCdBFIi9kKDkULRXnlt0H3IyPpz9eR00j7gm5S5B+3/ x0JcAV0snyagcwBzDUvXeuA9kO66yK0H/ZvFpg9gGaXL5NzYAR1dqwh+DBJA9/W1C8 diFiloonft76w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Antipov , Arend van Spriel , Kalle Valo , Sasha Levin , johannes.berg@intel.com, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com Subject: [PATCH AUTOSEL 5.15 03/14] wifi: brcmsmac: add gain range check to wlc_phy_iqcal_gainparams_nphy() Date: Sun, 26 Jan 2025 10:04:19 -0500 Message-Id: <20250126150430.958708-3-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126150430.958708-1-sashal@kernel.org> References: <20250126150430.958708-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: brcm80211@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.177 Content-Transfer-Encoding: 8bit From: Dmitry Antipov [ Upstream commit 3f4a0948c3524ae50f166dbc6572a3296b014e62 ] In 'wlc_phy_iqcal_gainparams_nphy()', add gain range check to WARN() instead of possible out-of-bounds 'tbl_iqcal_gainparams_nphy' access. Compile tested only. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Antipov Acked-by: Arend van Spriel Signed-off-by: Kalle Valo Link: https://patch.msgid.link/20241210070441.836362-1-dmantipov@yandex.ru Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c index 8580a27547891..42e7bc67e9143 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c @@ -23427,6 +23427,9 @@ wlc_phy_iqcal_gainparams_nphy(struct brcms_phy *pi, u16 core_no, break; } + if (WARN_ON(k == NPHY_IQCAL_NUMGAINS)) + return; + params->txgm = tbl_iqcal_gainparams_nphy[band_idx][k][1]; params->pga = tbl_iqcal_gainparams_nphy[band_idx][k][2]; params->pad = tbl_iqcal_gainparams_nphy[band_idx][k][3]; -- 2.39.5