[dpdk-stable] patch 'crypto/caam_jr: fix memory leak and illegal access' has been queued to LTS release 18.11.2

[Kevin Traynor]

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/07/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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From d9131a02259eab3a61c0bc0ce159104735fb7670 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh at nxp.com>
Date: Tue, 9 Apr 2019 06:18:38 +0000
Subject: [PATCH] crypto/caam_jr: fix memory leak and illegal access

[ upstream commit c761bffe0bb35529e76ec7b13e21af39e87b6424 ]

Opendir() returns allocated storage which must be freed at the
end of function or in case any return on error. so freeing the
allocation using closedir in an error case.

Coverity issue: 323507
Coverity issue: 325880
Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")

Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/caam_jr/caam_jr_uio.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index bf872a220..afd75c9a6 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -363,6 +363,6 @@ free_job_ring(uint32_t uio_fd)
 			(unsigned long)job_ring->map_size, strerror(errno));
 	} else
-		CAAM_JR_DEBUG("  JR UIO memory unmapped at %p",
-				job_ring->register_base_addr);
+		CAAM_JR_DEBUG("JR UIO memory is unmapped");
+
 	job_ring->register_base_addr = NULL;
 }
@@ -446,5 +446,9 @@ sec_configure(void)
 					dir->d_name, "name", uio_name);
 			CAAM_JR_INFO("sec device uio name: %s", uio_name);
-			SEC_ASSERT(ret == 0, -1, "file_read_first_line failed");
+			if (ret != 0) {
+				CAAM_JR_ERR("file_read_first_line failed\n");
+				closedir(d);
+				return -1;
+			}
 
 			if (file_name_match_extract(uio_name,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.322520169 +0100
+++ 0032-crypto-caam_jr-fix-memory-leak-and-illegal-access.patch	2019-04-30 17:58:13.809139739 +0100
@@ -1 +1 @@
-From c761bffe0bb35529e76ec7b13e21af39e87b6424 Mon Sep 17 00:00:00 2001
+From d9131a02259eab3a61c0bc0ce159104735fb7670 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c761bffe0bb35529e76ec7b13e21af39e87b6424 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org