From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olivier Matz Subject: [PATCH v3] mbuf: fix freeing of NULL mbuf when debug enabled Date: Mon, 29 Jan 2018 10:39:23 +0100 Message-ID: <20180129093923.18588-1-olivier.matz@6wind.com> References: <20180109142928.81687-1-keith.wiles@intel.com> Cc: Keith Wiles , stephen@networkplumber.org, jerin.jacob@caviumnetworks.com, stable@dpdk.org To: dev@dpdk.org Return-path: In-Reply-To: <20180109142928.81687-1-keith.wiles@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Do not panic when calling rte_pktmbuf_free(NULL) with mbuf debug enabled, it is a valid operation. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org 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 4519fb303..719d04dda 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.11.0