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

Kevin Traynor ktraynor at redhat.com
Wed May 8 12:15:02 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/13/19. 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/9960f97eba5b60118b7e2f7c17117fbf4a28730f

Thanks.

Kevin Traynor

---
>From 9960f97eba5b60118b7e2f7c17117fbf4a28730f Mon Sep 17 00:00:00 2001
From: Aaron Conole <aconole at redhat.com>
Date: Mon, 15 Apr 2019 10:48:18 -0400
Subject: [PATCH] net/virtio: fix dangling pointer on failure

[ upstream commit 7dee8c79483e370a346d68060b0b890b273e9a46 ]

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

Found during unit-test fixes.

Fixes: 43d18765c027 ("net/virtio: fix memory leak on failure")

Reported-by: Michael Santana <msantana at redhat.com>
Signed-off-by: Aaron Conole <aconole at redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 drivers/net/virtio/virtio_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index a1e3752a8..f938b7cef 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1709,4 +1709,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 out:
 	rte_free(eth_dev->data->mac_addrs);
+	eth_dev->data->mac_addrs = NULL;
 	return ret;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:06.853650924 +0100
+++ 0020-net-virtio-fix-dangling-pointer-on-failure.patch	2019-05-08 11:05:05.798933410 +0100
@@ -1 +1 @@
-From 7dee8c79483e370a346d68060b0b890b273e9a46 Mon Sep 17 00:00:00 2001
+From 9960f97eba5b60118b7e2f7c17117fbf4a28730f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7dee8c79483e370a346d68060b0b890b273e9a46 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 2272bb2e5..d25c08f0a 100644
+index a1e3752a8..f938b7cef 100644
@@ -25 +26 @@
-@@ -1863,4 +1863,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1709,4 +1709,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)


More information about the stable mailing list