From: Xavier Simonart <xavier.simonart@intel.com>
Date: Sun, 28 Oct 2018 14:54:28 +0000 (+0100)
Subject: Fix potential crash when shuffling mbufs
X-Git-Tag: opnfv-7.0.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F64337%2F1;p=samplevnf.git

Fix potential crash when shuffling mbufs

Change-Id: I70de6345afc6a696906f006c1b0f44540ae4ecec
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
---

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);