[dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Fri Jun 5 20:24:12 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e3217b5520e71d401785aa63649ac429603065e9

Thanks.

Kevin.

---
>From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Tue, 7 Apr 2020 19:35:43 +0800
Subject: [PATCH] net/octeontx: fix dangling pointer on init failure

[ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ]

When octeontx_create() is cleaning up, it does not correctly set
the mac_addrs variable to NULL, which will lead to a double free.

Fixes: 9e399b88ce2f ("net/octeontx: fix memory leak of MAC address table")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Harman Kalra <hkalra at marvell.com>
---
 drivers/net/octeontx/octeontx_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index ac193ace43..17128da994 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
 free_mac_addrs:
 	rte_free(data->mac_addrs);
+	data->mac_addrs = NULL;
 err:
 	if (nic)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.756091325 +0100
+++ 0015-net-octeontx-fix-dangling-pointer-on-init-failure.patch	2020-06-05 19:20:50.732042585 +0100
@@ -1 +1 @@
-From 5ed5df8073c80d1af9ec8c89a8b2a5299463058d Mon Sep 17 00:00:00 2001
+From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index ea3b278a15..d5371ae07d 100644
+index ac193ace43..17128da994 100644
@@ -22 +23 @@
-@@ -1455,4 +1455,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
+@@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,



More information about the stable mailing list