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 3C68CA04DD for ; Wed, 18 Nov 2020 17:37:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6691FC95A; Wed, 18 Nov 2020 17:37:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id A5AD9C956 for ; Wed, 18 Nov 2020 17:37:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717451; 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=wjzZUdFgQzuJ8U8Fxoy3J8zQU0+X/JXVXM7s3psAH48=; b=ZKd5qHh0IZqHUopCT7FW2e5JhdmnJyJ15nOFirT5s8tMx4eyxIZYqEBq5FR7LihgUlsiGw hYJnjAbfgBXAKogNa/ppcxsxQ0EFRn9ztzNiqs2hXDlGULLjn3WxA8s0b/nGNYnXLIHmNZ 94eWHRJ8Yu3iuTMTruAwRLnmJvC80hQ= 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-366-kSKR8oeTO2WRVCfVTcH5GQ-1; Wed, 18 Nov 2020 11:37:27 -0500 X-MC-Unique: kSKR8oeTO2WRVCfVTcH5GQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 718678C67C7; Wed, 18 Nov 2020 16:37:22 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32E185C1A3; Wed, 18 Nov 2020 16:37:20 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Yipeng Wang , dpdk stable Date: Wed, 18 Nov 2020 16:35:25 +0000 Message-Id: <20201118163558.1101823-39-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'efd: fix tailq entry leak in error path' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/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/941bad7770322c5e10f9e9e0d29d521f51713a02 Thanks. Kevin. --- >From 941bad7770322c5e10f9e9e0d29d521f51713a02 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 29 Sep 2020 11:31:35 +0800 Subject: [PATCH] efd: fix tailq entry leak in error path [ upstream commit c2402fcaf937b17da2b886443c3733b4234eea68 ] In rte_efd_create() allocated memory for tailq entry, we should free it when error happens, otherwise it will lead to memory leak. Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library") Signed-off-by: Yunjian Wang Acked-by: Yipeng Wang --- lib/librte_efd/rte_efd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c index a07b48475c..aa86f1a8e4 100644 --- a/lib/librte_efd/rte_efd.c +++ b/lib/librte_efd/rte_efd.c @@ -706,4 +706,5 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len, error_unlock_exit: rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + rte_free(te); rte_efd_free(table); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.675267958 +0000 +++ 0039-efd-fix-tailq-entry-leak-in-error-path.patch 2020-11-18 16:33:37.938215068 +0000 @@ -1 +1 @@ -From c2402fcaf937b17da2b886443c3733b4234eea68 Mon Sep 17 00:00:00 2001 +From 941bad7770322c5e10f9e9e0d29d521f51713a02 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c2402fcaf937b17da2b886443c3733b4234eea68 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ec3a4cd58e..77f46809f8 100644 +index a07b48475c..aa86f1a8e4 100644 @@ -22 +23 @@ -@@ -712,4 +712,5 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len, +@@ -706,4 +706,5 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len, @@ -24 +25 @@ - rte_mcfg_tailq_write_unlock(); + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);