[dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' has been queued to LTS release 18.11.9

[Kevin Traynor]

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/1f22d214c787a5c286819dab90bedb32c0c2aac5

Thanks.

Kevin.

---
>From 1f22d214c787a5c286819dab90bedb32c0c2aac5 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Sun, 26 Apr 2020 14:36:15 +0800
Subject: [PATCH] crypto/ccp: fix fd leak on probe failure

[ upstream commit 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 ]

Zero is a valid fd. When ccp_probe_device() is failed, the uio_fd won't be
closed thus leading fd leak.

Fixes: ef4b04f87fa6 ("crypto/ccp: support device init")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Ravi Kumar <ravi1.kumar at amd.com>
---
 drivers/crypto/ccp/ccp_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index 80fe6a4533..7d98b2eb25 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -761,5 +761,5 @@ ccp_probe_device(const char *dirname, uint16_t domain,
 fail:
 	CCP_LOG_ERR("CCP Device probe failed");
-	if (uio_fd > 0)
+	if (uio_fd >= 0)
 		close(uio_fd);
 	if (ccp_dev)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.413489991 +0100
+++ 0028-crypto-ccp-fix-fd-leak-on-probe-failure.patch	2020-06-05 19:20:50.755042063 +0100
@@ -1 +1 @@
-From 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 Mon Sep 17 00:00:00 2001
+From 1f22d214c787a5c286819dab90bedb32c0c2aac5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org