From af50d8b2df4fd62ccf092297ee3134d972df88e1 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 26 Jan 2018 09:40:55 +0100 Subject: [PATCH] mbuf: fix freeing of NULL mbuf when debug enabled Do not panic when calling rte_pktmbuf_free(NULL) with mbuf debug enabled, it is a valid operation. Reported-by: Keith Wiles Signed-off-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 4519fb3032..719d04dda2 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1439,13 +1439,14 @@ rte_pktmbuf_free_seg(struct rte_mbuf *m) * segment is added back into its original mempool. * * @param m - * The packet mbuf to be freed. + * The packet mbuf to be freed. If NULL, the function does nothing. */ static inline void rte_pktmbuf_free(struct rte_mbuf *m) { struct rte_mbuf *m_next; - __rte_mbuf_sanity_check(m, 1); + if (m != NULL) + __rte_mbuf_sanity_check(m, 1); while (m != NULL) { m_next = m->next; -- 2.20.1