Skip to contentSkip to conversation

net/mlx5: fix invalid memory access in port closing

PATCH In review Michael Baum 2 participants 2 messages Nov 17, 2022 – Nov 20, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix invalid memory access in port closing

The shared IB device (sh) has per port data updated in port creation. In port closing this port data is updated even when the SH still exist.

However, this updating is happened after SH has been released and for last port it actually accesses to freed memory.

This patch updates the port data before SH releasing.

Fixes 13c5c093905c ("net/mlx5: fix port event cleaning order")
---
 drivers/net/mlx5/mlx5.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +6 -6
index 6a0d66247a..e55be8720e 100644
@@ -2119,6 +2119,12 @@ mlx5_dev_close(struct rte_eth_dev *dev)
 	if (priv->hrxqs)
 		mlx5_list_destroy(priv->hrxqs);
 	mlx5_free(priv->ext_rxqs);
+	priv->sh->port[priv->dev_port - 1].nl_ih_port_id = RTE_MAX_ETHPORTS;
+	/*
+	 * The interrupt handler port id must be reset before priv is reset
+	 * since 'mlx5_dev_interrupt_nl_cb' uses priv.
+	 */
+	rte_io_wmb();
 	/*
 	 * Free the shared context in last turn, because the cleanup
 	 * routines above may use some shared fields, like
@@ -2144,12 +2150,6 @@ mlx5_dev_close(struct rte_eth_dev *dev)
 		if (!c)
 			claim_zero(rte_eth_switch_domain_free(priv->domain_id));
 	}
-	priv->sh->port[priv->dev_port - 1].nl_ih_port_id = RTE_MAX_ETHPORTS;
-	/*
-	 * The interrupt handler port id must be reset before priv is reset
-	 * since 'mlx5_dev_interrupt_nl_cb' uses priv.
-	 */
-	rte_io_wmb();
 	memset(priv, 0, sizeof(*priv));
 	priv->domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID;
 	/*
Signature · 1 line
2.25.1
#1 lore raw

Hi,

Quoted 15 lines

-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Thursday, November 17, 2022 5:28 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Michael Baum <[email protected]>
Subject: [PATCH] net/mlx5: fix invalid memory access in port closing

The shared IB device (sh) has per port data updated in port creation. In port closing this port data is updated even when the SH still exist.

However, this updating is happened after SH has been released and for last port it actually accesses to freed memory.

Quoted 7 lines

This patch updates the port data before SH releasing.

Fixes 13c5c093905c ("net/mlx5: fix port event cleaning order")

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh