From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH v2] mempool: fix unsafe removal from list by callback Date: Mon, 25 Jul 2016 21:54:36 +0200 Message-ID: <1469476476-2148-1-git-send-email-thomas.monjalon@6wind.com> References: Cc: dev@dpdk.org To: olivier.matz@dpdk.org Return-path: Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 3AA7E3772 for ; Mon, 25 Jul 2016 21:54:47 +0200 (CEST) Received: by mail-wm0-f52.google.com with SMTP id f65so148281348wmi.0 for ; Mon, 25 Jul 2016 12:54:47 -0700 (PDT) In-Reply-To: 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" If a mempool is removed from the list by a callback function during rte_mempool_walk(), the TAILQ_FOREACH loop will fail unexpectedly. It is fixed by using the safe version of the loop macro. Reported-by: Sergio Gonzalez Monroy Signed-off-by: Thomas Monjalon --- lib/librte_mempool/rte_mempool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index 8806633..2e28e2e 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -1283,12 +1283,13 @@ void rte_mempool_walk(void (*func)(struct rte_mempool *, void *), { struct rte_tailq_entry *te = NULL; struct rte_mempool_list *mempool_list; + void *tmp_te; mempool_list = RTE_TAILQ_CAST(rte_mempool_tailq.head, rte_mempool_list); rte_rwlock_read_lock(RTE_EAL_MEMPOOL_RWLOCK); - TAILQ_FOREACH(te, mempool_list, next) { + TAILQ_FOREACH_SAFE(te, mempool_list, next, tmp_te) { (*func)((struct rte_mempool *) te->data, arg); } -- 2.7.0