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

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From 842ee58a1d02aeca33d0720fa06c06d22ab43c63 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 b242abb0fc..b3e55ff3bc 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1625,6 +1625,7 @@ 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.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:11.118331881 -0700
+++ 0086-net-virtio-fix-dangling-pointer-on-failure.patch	2019-07-22 17:55:06.407478000 -0700
@@ -1,15 +1,16 @@
-From 7dee8c79483e370a346d68060b0b890b273e9a46 Mon Sep 17 00:00:00 2001
+From 842ee58a1d02aeca33d0720fa06c06d22ab43c63 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")
-Cc: stable at dpdk.org
 
 Reported-by: Michael Santana <msantana at redhat.com>
 Signed-off-by: Aaron Conole <aconole at redhat.com>
@@ -19,10 +20,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
-index 2272bb2e56..d25c08f0a2 100644
+index b242abb0fc..b3e55ff3bc 100644
 --- a/drivers/net/virtio/virtio_ethdev.c
 +++ b/drivers/net/virtio/virtio_ethdev.c
-@@ -1862,6 +1862,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1625,6 +1625,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
  
  out:
  	rte_free(eth_dev->data->mac_addrs);