From patchwork Wed Mar 16 12:33:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ehrhardt X-Patchwork-Id: 11545 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C79F5568A; Wed, 16 Mar 2016 13:34:15 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 30A655680 for ; Wed, 16 Mar 2016 13:34:13 +0100 (CET) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1agAeS-0002Hx-TY; Wed, 16 Mar 2016 12:34:12 +0000 From: Christian Ehrhardt To: christian.ehrhardt@canonical.com, bruce.richardson@intel.com, dev@dpdk.org Date: Wed, 16 Mar 2016 13:33:49 +0100 Message-Id: <1458131629-21925-4-git-send-email-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1458131629-21925-1-git-send-email-christian.ehrhardt@canonical.com> References: <1458131629-21925-1-git-send-email-christian.ehrhardt@canonical.com> Subject: [dpdk-dev] [PATCH 3/3] lpm: fix missing free of lpm X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixing lpm6 regarding a similar issue showed that that in rte_lpm_free lpm might not be freed if it didn't find a te (early return) Acked-by: Bruce Richardson Signed-off-by: Christian Ehrhardt --- lib/librte_lpm/rte_lpm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index ccaaa2a..d5fa1f8 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -360,12 +360,8 @@ rte_lpm_free_v20(struct rte_lpm_v20 *lpm) if (te->data == (void *) lpm) break; } - if (te == NULL) { - rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); - return; - } - - TAILQ_REMOVE(lpm_list, te, next); + if (te != NULL) + TAILQ_REMOVE(lpm_list, te, next); rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);