[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241113111319.1156507-6-srasheed@marvell.com>
Date: Wed, 13 Nov 2024 03:13:17 -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>,
"Shinas
Rasheed" <srasheed@...vell.com>,
Veerasenareddy Burru <vburru@...vell.com>,
Satananda Burla <sburla@...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>
Subject: [PATCH net v4 5/7] octeon_ep_vf: 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: cb7dd712189f ("octeon_ep_vf: Add driver framework and device initialization")
Signed-off-by: Shinas Rasheed <srasheed@...vell.com>
---
V4:
- No Changes
V3: https://lore.kernel.org/all/20241108074543.1123036-6-srasheed@marvell.com/
- Added back "Fixes" to the changelist
V2: https://lore.kernel.org/all/20241107132846.1118835-6-srasheed@marvell.com/
- Split into a separate patch
- Added more context
V1: https://lore.kernel.org/all/20241101103416.1064930-4-srasheed@marvell.com/
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
index 7e6771c9cdbb..79d9ffd593eb 100644
--- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
@@ -790,6 +790,9 @@ static void octep_vf_get_stats64(struct net_device *netdev,
struct octep_vf_iq *iq = oct->iq[q];
struct octep_vf_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