Skip to contentSkip to conversation

fixes for failsafe/tap

PATCH Applied Yunjian Wang 2 participants 4 messages Jun 7, 2022 – Jun 8, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

cover fixes for failsafe/tap

This series include two fixes patches for failsafe/tap

Yunjian Wang (2):
net/failsafe: fix freeing after device release
net/tap: fix use after free on error path

 drivers/net/failsafe/failsafe.c | 2 +-
 drivers/net/tap/rte_eth_tap.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/2 net/failsafe: fix freeing after device release

The PMD destroy function was calling the release function, which frees dev->data->dev_private, and then tries to free PRIV(dev)->intr_handle, which causes the heap use after free issue.

The free can be moved to before the release function is called.

Fixes d61138d4f0e ("drivers: remove direct access to interrupt handle")
---
 drivers/net/failsafe/failsafe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/failsafe/failsafe.c +1 -1
index 3c754a5f66..05cf533896 100644
@@ -308,8 +308,8 @@ fs_rte_eth_free(const char *name)
 	if (dev == NULL)
 		return 0; /* port already released */
 	ret = failsafe_eth_dev_close(dev);
-	rte_eth_dev_release_port(dev);
 	rte_intr_instance_free(PRIV(dev)->intr_handle);
+	rte_eth_dev_release_port(dev);
 	return ret;
 }
 
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/2 net/tap: fix use after free on error path

In reply to Yunjian Wang

The error path was calling rte_eth_dev_release_port() function, which frees eth_dev->data->dev_private, and then tries to free pmd->intr_handle, which causes the use after free issue.

The free can be moved to before the release function is called.

Fixes d61138d4f0e ("drivers: remove direct access to interrupt handle")
---
 drivers/net/tap/rte_eth_tap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/tap/rte_eth_tap.c +1 -1
index 5495818be6..9e1032fe72 100644
@@ -2179,8 +2179,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,
 		close(pmd->ioctl_sock);
 	/* mac_addrs must not be freed alone because part of dev_private */
 	dev->data->mac_addrs = NULL;
-	rte_eth_dev_release_port(dev);
 	rte_intr_instance_free(pmd->intr_handle);
+	rte_eth_dev_release_port(dev);
 
 error_exit_nodev:
 	TAP_LOG(ERR, "%s Unable to initialize %s",
Signature · 1 line
2.27.0
#3 lore raw
In reply to Yunjian Wang
Quoted 10 lines · Yunjian Wang

This series include two fixes patches for failsafe/tap

Yunjian Wang (2):
net/failsafe: fix freeing after device release
net/tap: fix use after free on error path

  drivers/net/failsafe/failsafe.c | 2 +-
  drivers/net/tap/rte_eth_tap.c   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to dpdk-next-net/main, thanks.