patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] event: fix check in ring_init() in event ring code
@ 2018-08-02  8:36 Harry van Haaren
  2018-08-02 12:43 ` Jerin Jacob
  2018-08-02 14:43 ` [dpdk-stable] [PATCH v2] event: fix check in ring init() " Harry van Haaren
  0 siblings, 2 replies; 4+ messages in thread
From: Harry van Haaren @ 2018-08-02  8:36 UTC (permalink / raw)
  To: dev; +Cc: Harry van Haaren, bruce.richardson, stable, thomas, jerin.jacob

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 <harry.van.haaren@intel.com>

---

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-08-05 12:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-02  8:36 [dpdk-stable] [PATCH] event: fix check in ring_init() in event ring code Harry van Haaren
2018-08-02 12:43 ` Jerin Jacob
2018-08-02 14:43 ` [dpdk-stable] [PATCH v2] event: fix check in ring init() " Harry van Haaren
2018-08-05 12:52   ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).