From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Grant Grundler <grundler@chromium.org>,
Aashay Shringarpure <aashay@google.com>,
Yi Chou <yich@google.com>,
Shervin Oloumi <enlightened@google.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
irusskikh@marvell.com, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 15/17] net: atlantic: verify hw_head_ lies within TX buffer ring
Date: Wed, 18 May 2022 08:27:49 -0400 [thread overview]
Message-ID: <20220518122753.342758-15-sashal@kernel.org> (raw)
In-Reply-To: <20220518122753.342758-1-sashal@kernel.org>
From: Grant Grundler <grundler@chromium.org>
[ Upstream commit 2120b7f4d128433ad8c5f503a9584deba0684901 ]
Bounds check hw_head index provided by NIC to verify it lies
within the TX buffer ring.
Reported-by: Aashay Shringarpure <aashay@google.com>
Reported-by: Yi Chou <yich@google.com>
Reported-by: Shervin Oloumi <enlightened@google.com>
Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 9f1b15077e7d..45c17c585d74 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -889,6 +889,13 @@ int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *self,
err = -ENXIO;
goto err_exit;
}
+
+ /* Validate that the new hw_head_ is reasonable. */
+ if (hw_head_ >= ring->size) {
+ err = -ENXIO;
+ goto err_exit;
+ }
+
ring->hw_head = hw_head_;
err = aq_hw_err_from_flags(self);
--
2.35.1
next prev parent reply other threads:[~2022-05-18 12:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 12:27 [PATCH AUTOSEL 5.15 01/17] scsi: scsi_dh_alua: Properly handle the ALUA transitioning state Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 02/17] scsi: qla2xxx: Fix missed DMA unmap for aborted commands Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 03/17] mac80211: fix rx reordering with non explicit / psmp ack policy Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 04/17] nl80211: validate S1G channel width Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 05/17] selftests: add ping test with ping_group_range tuned Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 06/17] Revert "fbdev: Make fb_release() return -ENODEV if fbdev was unregistered" Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 07/17] fbdev: Prevent possible use-after-free in fb_release() Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 08/17] net: fix wrong network header length Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 09/17] nl80211: fix locking in nl80211_set_tx_bitrate_mask() Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 10/17] ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one() Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 11/17] net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe() Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 12/17] net: atlantic: fix "frag[0] not initialized" Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 13/17] net: atlantic: reduce scope of is_rsc_complete Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 14/17] net: atlantic: add check for MAX_SKB_FRAGS Sasha Levin
2022-05-18 12:27 ` Sasha Levin [this message]
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 16/17] arm64: Enable repeat tlbi workaround on KRYO4XX gold CPUs Sasha Levin
2022-05-18 12:27 ` [PATCH AUTOSEL 5.15 17/17] usb: gadget: fix race when gadget driver register via ioctl Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220518122753.342758-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=aashay@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=enlightened@google.com \
--cc=grundler@chromium.org \
--cc=irusskikh@marvell.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=yich@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).