summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2016-07-25 21:32:03 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-07-25 22:20:51 +0200
commitcae54ac47cedbf9836a09dc61fbb85bd4ac8afd1 (patch)
treea4c05acd4f969f97f1a897dd9801b3df12c7ec47
parent3cb6bdc761409b1c740340a6a9ab71af66a2c1fe (diff)
downloaddpdk-cae54ac47cedbf9836a09dc61fbb85bd4ac8afd1.zip
dpdk-cae54ac47cedbf9836a09dc61fbb85bd4ac8afd1.tar.gz
dpdk-cae54ac47cedbf9836a09dc61fbb85bd4ac8afd1.tar.xz
mempool: fix unsafe removal from list by callback
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 <sergio.gonzalez.monroy@intel.com> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>
-rw-r--r--lib/librte_mempool/rte_mempool.c3
1 files changed, 2 insertions, 1 deletions
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);
}