From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E85A2A04A3 for ; Fri, 5 Jun 2020 20:26:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E09B51D510; Fri, 5 Jun 2020 20:26:56 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id ADB841D510 for ; Fri, 5 Jun 2020 20:26:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KjyNUNbwL1YKBAGzFaLcuzZUfWRN6vRZoB97G+u35zo=; b=jIjUnBIR3vO1rkYLmV0EcM56dk+oQiJJViki0swbIK4hkGRrw1m9YsCh5t2V6vgZyAr+LN +QhdWqYfcf8U8EQWUTtvVuG9MH2pXcVsOQ/h5VUW1aeuPts8Ia63I6z+OVAY9jtyIWp3Kx dPNcGNNnW6032KBw5UdL433Zn45tgyc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-CwiPAVx3PwGYy8FD5h648A-1; Fri, 05 Jun 2020 14:26:50 -0400 X-MC-Unique: CwiPAVx3PwGYy8FD5h648A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C34219057CD; Fri, 5 Jun 2020 18:26:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A8E360C47; Fri, 5 Jun 2020 18:26:44 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ravi Kumar , dpdk stable Date: Fri, 5 Jun 2020 19:24:25 +0100 Message-Id: <20200605182525.22483-28-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' has been queued to LTS release 18.11.9 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.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 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 Acked-by: Ravi Kumar --- 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@dpdk.org