DPDK patches and discussions
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: christian.ehrhardt@canonical.com, bruce.richardson@intel.com,
	dev@dpdk.org, olivier.matz@6wind.com
Subject: [dpdk-dev] [PATCH 5/5] lpm: fix missing free of rules_tbl and lpm in rte_lpm_free*
Date: Wed, 16 Mar 2016 15:16:33 +0100	[thread overview]
Message-ID: <1458137793-25826-6-git-send-email-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <1458137793-25826-1-git-send-email-christian.ehrhardt@canonical.com>

As found in rte_lpm6_free the two lpm interfaces rte_lpm_free_v20 and
rte_lpm_free_v1604 had a leak.

rte_lpm_free_v20 might have missed to free rules_tbl
rte_lpm_free_v1604 due to an early exit might have missed to free
rules_tbl and lpm itself.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 lib/librte_lpm/rte_lpm.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index d21c783..e8fe33e 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -368,6 +368,7 @@ rte_lpm_free_v20(struct rte_lpm_v20 *lpm)
 
 	rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
+	rte_free(lpm->rules_tbl);
 	rte_free(lpm);
 	rte_free(te);
 }
@@ -392,15 +393,12 @@ rte_lpm_free_v1604(struct rte_lpm *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);
 
+	rte_free(lpm->rules_tbl);
 	rte_free(lpm);
 	rte_free(te);
 }
-- 
2.7.0

  parent reply	other threads:[~2016-03-16 14:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 14:16 [dpdk-dev] [PATCH 0/5] lpm allocation fixes - v3 Christian Ehrhardt
2016-03-16 14:16 ` [dpdk-dev] [PATCH 1/5] lpm6: fix use after free of lpm in rte_lpm6_create Christian Ehrhardt
2016-03-16 14:16 ` [dpdk-dev] [PATCH 2/5] lpm6: fix missing free of rules_tbl and lpm Christian Ehrhardt
2016-03-16 14:16 ` [dpdk-dev] [PATCH 3/5] lpm: fix missing free of lpm Christian Ehrhardt
2016-03-16 14:16 ` [dpdk-dev] [PATCH 4/5] lpm: fix use after free of lpm in rte_lpm_create* Christian Ehrhardt
2016-03-16 14:16 ` Christian Ehrhardt [this message]
2016-03-21 13:18 ` [dpdk-dev] [PATCH 0/5] lpm allocation fixes - v3 Olivier Matz
2016-03-21 14:02   ` Christian Ehrhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458137793-25826-6-git-send-email-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=olivier.matz@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).