diff options
| author |   Xavier Simonart <xavier.simonart@intel.com> | 2018-10-28 15:54:28 +0100 |
|---|---|---|
| committer | Xavier Simonart <xavier.simonart@intel.com> | 2018-10-30 11:54:43 +0100 |
| commit | 7a15b2e3e49cce7c8cfd1d0a03ee5cf82676bdcb (patch) | |
| tree | 8f2ca437342e89f49bdaffaa2bf7e9a9895299e9 | |
| parent | ffdcfa6b834d3ad00188ee9805370d6aefc44b4b (diff) | |
Fix potential crash when shuffling mbufs
Change-Id: I70de6345afc6a696906f006c1b0f44540ae4ecec
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
| -rw-r--r-- | VNFs/DPPD-PROX/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/VNFs/DPPD-PROX/main.c b/VNFs/DPPD-PROX/main.c index 2e1616af..ec1ecb58 100644 --- a/VNFs/DPPD-PROX/main.c +++ b/VNFs/DPPD-PROX/main.c @@ -571,13 +571,14 @@ static void shuffle_mempool(struct rte_mempool* mempool, uint32_t nb_mbuf) struct rte_mbuf** pkts = prox_zmalloc(nb_mbuf * sizeof(*pkts), rte_socket_id()); uint64_t got = 0; - while (rte_mempool_get_bulk(mempool, (void**)(pkts + got), 1) == 0) + while ((got < nb_mbuf) && (rte_mempool_get_bulk(mempool, (void**)(pkts + got), 1) == 0)) ++got; + nb_mbuf = got; while (got) { int idx; do { - idx = rand() % nb_mbuf - 1; + idx = rand() % nb_mbuf; } while (pkts[idx] == 0); rte_mempool_put_bulk(mempool, (void**)&pkts[idx], 1); |