[dpdk-stable] patch 'net/tap: fix file close on remove' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/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.

Thanks.

Luca Boccassi

---
>From 2523e877dcbf0ede8baf9223af113b6974225515 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Thu, 16 Apr 2020 11:04:45 +0800
Subject: [PATCH] net/tap: fix file close on remove

[ upstream commit f9d5da4ab686b331c55bb98f43237d64ab820d0b ]

The internal structure is freed and set to NULL in the
rte_eth_dev_release_port() and zero is a valid fd. Ultimately
leads to a valid fd was closed by mistake.

Fixes: 3101191c63ab ("net/tap: fix device removal when no queue exist")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/tap/rte_eth_tap.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 2846ce0d3e..41ea54888e 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2450,10 +2450,6 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
 	tap_devices_count--;
 	rte_eth_dev_release_port(eth_dev);
 
-	if (internals->ka_fd != -1) {
-		close(internals->ka_fd);
-		internals->ka_fd = -1;
-	}
 	return 0;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:48.383133582 +0100
+++ 0096-net-tap-fix-file-close-on-remove.patch	2020-05-19 14:04:44.308650040 +0100
@@ -1,14 +1,15 @@
-From f9d5da4ab686b331c55bb98f43237d64ab820d0b Mon Sep 17 00:00:00 2001
+From 2523e877dcbf0ede8baf9223af113b6974225515 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Thu, 16 Apr 2020 11:04:45 +0800
 Subject: [PATCH] net/tap: fix file close on remove
 
+[ upstream commit f9d5da4ab686b331c55bb98f43237d64ab820d0b ]
+
 The internal structure is freed and set to NULL in the
 rte_eth_dev_release_port() and zero is a valid fd. Ultimately
 leads to a valid fd was closed by mistake.
 
 Fixes: 3101191c63ab ("net/tap: fix device removal when no queue exist")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>