From: Shinas Rasheed <srasheed@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <hgani@marvell.com>, <sedara@marvell.com>, <vimleshk@marvell.com>,
<thaller@redhat.com>, <wizhao@redhat.com>, <kheib@redhat.com>,
<egallen@redhat.com>, <konguyen@redhat.com>, <horms@kernel.org>,
<frank.feng@synaxg.com>, Shinas Rasheed <srasheed@marvell.com>,
Veerasenareddy Burru <vburru@marvell.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Satananda Burla <sburla@marvell.com>,
Abhijit Ayarekar <aayarekar@marvell.com>
Subject: [PATCH net v3 2/7] octeon_ep: Fix null dereferences to IQ/OQ pointers
Date: Thu, 7 Nov 2024 23:45:38 -0800 [thread overview]
Message-ID: <20241108074543.1123036-3-srasheed@marvell.com> (raw)
In-Reply-To: <20241108074543.1123036-1-srasheed@marvell.com>
During unload, sometimes race scenarios are seen wherein
the get stats callback proceeds to retrieve the IQ/OQ stats,
but by then the IQ/OQ might have been already freed.
Protect against such conditions by defensively checking if
the IQ/OQ pointers are null before dereference.
Fixes: 6a610a46bad1 ("octeon_ep: add support for ndo ops")
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
---
V3:
- Added back "Fixes" to the changelist
V2: https://lore.kernel.org/all/20241107132846.1118835-3-srasheed@marvell.com/
- Split from earlier patch into a separate patch
- Added more context
V2: https://lore.kernel.org/all/20241101103416.1064930-3-srasheed@marvell.com/
drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index ff72b796bd25..dc783c568e2c 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -1016,6 +1016,9 @@ static void octep_get_stats64(struct net_device *netdev,
struct octep_iq *iq = oct->iq[q];
struct octep_oq *oq = oct->oq[q];
+ if (!iq || !oq)
+ return;
+
tx_packets += iq->stats.instr_completed;
tx_bytes += iq->stats.bytes_sent;
rx_packets += oq->stats.packets;
--
2.25.1
next prev parent reply other threads:[~2024-11-08 7:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 7:45 [PATCH net v3 0/7] Double free fixes and NULL pointer checks Shinas Rasheed
2024-11-08 7:45 ` [PATCH net v3 1/7] octeon_ep: Add checks to fix double free crashes Shinas Rasheed
2024-11-09 15:10 ` Vadim Fedorenko
2024-11-11 5:21 ` [EXTERNAL] " Shinas Rasheed
2024-11-12 13:03 ` Shinas Rasheed
2024-11-08 7:45 ` Shinas Rasheed [this message]
2024-11-08 7:45 ` [PATCH net v3 3/7] octeon_ep: add protective null checks in napi callbacks for cn9k cards Shinas Rasheed
2024-11-08 7:45 ` [PATCH net v3 4/7] octeon_ep: add protective null checks in napi callbacks for cnxk cards Shinas Rasheed
2024-11-08 7:45 ` [PATCH net v3 5/7] octeon_ep_vf: Fix null dereferences to IQ/OQ pointers Shinas Rasheed
2024-11-08 7:45 ` [PATCH net v3 6/7] octeon_ep_vf: add protective null checks in napi callbacks for cn9k cards Shinas Rasheed
2024-11-08 7:45 ` [PATCH net v3 7/7] octeon_ep_vf: add protective null checks in napi callbacks for cnxk cards Shinas Rasheed
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=20241108074543.1123036-3-srasheed@marvell.com \
--to=srasheed@marvell.com \
--cc=aayarekar@marvell.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=egallen@redhat.com \
--cc=frank.feng@synaxg.com \
--cc=hgani@marvell.com \
--cc=horms@kernel.org \
--cc=kheib@redhat.com \
--cc=konguyen@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sburla@marvell.com \
--cc=sedara@marvell.com \
--cc=thaller@redhat.com \
--cc=vburru@marvell.com \
--cc=vimleshk@marvell.com \
--cc=wizhao@redhat.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).