[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241108074543.1123036-3-srasheed@marvell.com>
Date: Thu, 7 Nov 2024 23:45:38 -0800
From: Shinas Rasheed <srasheed@...vell.com>
To: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: <hgani@...vell.com>, <sedara@...vell.com>, <vimleshk@...vell.com>,
<thaller@...hat.com>, <wizhao@...hat.com>, <kheib@...hat.com>,
<egallen@...hat.com>, <konguyen@...hat.com>, <horms@...nel.org>,
<frank.feng@...axg.com>, Shinas Rasheed <srasheed@...vell.com>,
Veerasenareddy Burru <vburru@...vell.com>,
Andrew Lunn
<andrew+netdev@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
"Eric
Dumazet" <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
<pabeni@...hat.com>,
Satananda Burla <sburla@...vell.com>,
Abhijit Ayarekar
<aayarekar@...vell.com>
Subject: [PATCH net v3 2/7] octeon_ep: Fix null dereferences to IQ/OQ pointers
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@...vell.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
Powered by blists - more mailing lists