From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id E7289A0679 for ; Tue, 30 Apr 2019 19:02:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D196A5B40; Tue, 30 Apr 2019 19:02:43 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id EAEBA58FE for ; Tue, 30 Apr 2019 19:02:41 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77DB63084242; Tue, 30 Apr 2019 17:02:38 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D7546D0AC; Tue, 30 Apr 2019 17:02:36 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Date: Tue, 30 Apr 2019 18:01:27 +0100 Message-Id: <20190430170133.2331-32-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 30 Apr 2019 17:02:41 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/caam_jr: fix memory leak and illegal access' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Akhil Goyal --- 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@dpdk.org