[dpdk-stable] patch 'net/af_packet: fix check of file descriptors' has been queued to LTS release 18.11.10

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/2cea42a592e20072c337cbe9fc070dd57615fcb3

Thanks.

Kevin.

---
From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 6 Jul 2020 20:27:32 +0800
Subject: [PATCH] net/af_packet: fix check of file descriptors

[ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ]

Zero is a valid fd. It will fail to check the fd if the fd is zero.

Fixes: 527740ccfaec ("af_packet: fix some leaks")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 90e34c45ac..698197b552 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 		(*internals)->rx_queue[q].map = MAP_FAILED;
 		(*internals)->tx_queue[q].map = MAP_FAILED;
+		(*internals)->rx_queue[q].sockfd = -1;
+		(*internals)->tx_queue[q].sockfd = -1;
 	}
 
@@ -796,5 +798,5 @@ error:
 		rte_free((*internals)->rx_queue[q].rd);
 		rte_free((*internals)->tx_queue[q].rd);
-		if (((*internals)->rx_queue[q].sockfd != 0) &&
+		if (((*internals)->rx_queue[q].sockfd >= 0) &&
 			((*internals)->rx_queue[q].sockfd != qsockfd))
 			close((*internals)->rx_queue[q].sockfd);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.033097369 +0100
+++ 0002-net-af_packet-fix-check-of-file-descriptors.patch	2020-08-28 11:03:25.894955238 +0100
@@ -1 +1 @@
-From c6d1a552a8798df02bf85627c5d47a28ccdc62f8 Mon Sep 17 00:00:00 2001
+From 2cea42a592e20072c337cbe9fc070dd57615fcb3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c6d1a552a8798df02bf85627c5d47a28ccdc62f8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index e1e7f3973b..db5de8e45e 100644
+index 90e34c45ac..698197b552 100644
@@ -21 +22 @@
-@@ -646,4 +646,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
+@@ -589,4 +589,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
@@ -28 +29 @@
-@@ -849,5 +851,5 @@ error:
+@@ -796,5 +798,5 @@ error: