From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry van Haaren Subject: [PATCH] event: fix check in ring_init() in event ring code Date: Thu, 2 Aug 2018 09:36:04 +0100 Message-ID: <1533198964-30218-1-git-send-email-harry.van.haaren@intel.com> Cc: Harry van Haaren , bruce.richardson@intel.com, stable@dpdk.org, thomas@monjalon.net, jerin.jacob@caviumnetworks.com To: dev@dpdk.org Return-path: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit fixes a bug in a 32-bit environment where the generic ring_init() would fail, but given the interaction with memzones the next iteration of the event_ring_autotest would actually *pass* because the ring in question would exist already an be looked-up. This commit rightly error checks the result of ring_init(), and calls rte_free() on the memory as required. Fixes: dc39e2f359b5 ("eventdev: add ring structure for events") Cc: bruce.richardson@intel.com Cc: stable@dpdk.org Signed-off-by: Harry van Haaren --- Cc: thomas@monjalon.net Cc: jerin.jacob@caviumnetworks.com Please consider this for RC3, as it fixes the unit tests on 32-bit systems. --- lib/librte_eventdev/rte_event_ring.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/librte_eventdev/rte_event_ring.c b/lib/librte_eventdev/rte_event_ring.c index eb67751..5791928 100644 --- a/lib/librte_eventdev/rte_event_ring.c +++ b/lib/librte_eventdev/rte_event_ring.c @@ -82,11 +82,14 @@ rte_event_ring_create(const char *name, unsigned int count, int socket_id, mz = rte_memzone_reserve(mz_name, ring_size, socket_id, mz_flags); if (mz != NULL) { r = mz->addr; - /* - * no need to check return value here, we already checked the - * arguments above - */ - rte_event_ring_init(r, name, requested_count, flags); + /* Check return value in case rte_ring_init() fails on size */ + int err = rte_event_ring_init(r, name, requested_count, flags); + if (err) { + RTE_LOG(ERR, RING, "Ring init failed\n"); + rte_free(te); + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + return 0; + } te->data = (void *) r; r->r.memzone = mz; -- 2.7.4