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 210F0A0096 for ; Wed, 10 Apr 2019 18:44:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E5B691B11F; Wed, 10 Apr 2019 18:44:18 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C177A1B105 for ; Wed, 10 Apr 2019 18:44:17 +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 89B433084289; Wed, 10 Apr 2019 16:44:16 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47B185D961; Wed, 10 Apr 2019 16:44:15 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Gage Eads , Ferruh Yigit , dpdk stable Date: Wed, 10 Apr 2019 17:43:09 +0100 Message-Id: <20190410164411.10546-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]); Wed, 10 Apr 2019 16:44:16 +0000 (UTC) Subject: [dpdk-stable] patch 'net/pcap: fix memory leak' 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 04/16/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. Thanks. Kevin Traynor --- >From b50c01307b4e113946661930ef8f4dd4e24414b1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 30 Jan 2019 09:08:54 +0800 Subject: [PATCH] net/pcap: fix memory leak [ upstream commit 9b3d42207c35516b1c62fbdf19da288e5c3d8356 ] Fix potential memory leak due to kvlist not be freed. Fixes: 0d0dd2d9d8ff ("net/pcap: enable data path for secondary process") Reported-by: Gage Eads Signed-off-by: Qi Zhang Acked-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 9fd932772..65bbd7e2f 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1259,5 +1259,6 @@ create_eth: PMD_LOG(ERR, "Failed to allocate memory for process private"); - return -1; + ret = -1; + goto free_kvlist; } @@ -1282,5 +1283,5 @@ create_eth: rte_eth_dev_probing_finish(eth_dev); - return 0; + goto free_kvlist; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:08.096489274 +0100 +++ 0001-net-pcap-fix-memory-leak.patch 2019-04-10 14:06:07.744296991 +0100 @@ -1,12 +1,13 @@ -From 9b3d42207c35516b1c62fbdf19da288e5c3d8356 Mon Sep 17 00:00:00 2001 +From b50c01307b4e113946661930ef8f4dd4e24414b1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 30 Jan 2019 09:08:54 +0800 Subject: [PATCH] net/pcap: fix memory leak +[ upstream commit 9b3d42207c35516b1c62fbdf19da288e5c3d8356 ] + Fix potential memory leak due to kvlist not be freed. Fixes: 0d0dd2d9d8ff ("net/pcap: enable data path for secondary process") -Cc: stable@dpdk.org Reported-by: Gage Eads Signed-off-by: Qi Zhang