From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 8E58E1B738 for ; Wed, 7 Feb 2018 17:47:20 +0100 (CET) Received: by mail-wr0-f196.google.com with SMTP id b52so1751494wrd.10 for ; Wed, 07 Feb 2018 08:47:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1K9fi6Xx37iZyQGb7OY2IW9xvd7fU8g/SzlW0wuyxu8=; b=RT9dVb4M/RpfohkmKO4Xrqk/0xj33+ltR/OeRXwdackfW4e/U8p4aMm+GcKF1duIV0 CnUgK9ZcluwVVe9OfSNLtmXI0kVX5BggCfv+NGV5AQWf5RN+lHYhyEYSOs/W4CvrdDEP CA3IRg3lgGQ2TTPv5CFJgEaW/KxdT7/JUPrU+zF+a3X5XlfzBBBMkwj3NWC5amfx5KpB /RAZAr2E1eKGXHJc5zsVft6h7uC+9fhB02R47Em7ObG61gmdQVFlchXpfFGqJMpjTFoy 2y1u8HsCpahkXJhq+L3QyqHTd5r5fepdEOb735JI5sYRzSiazYiOyA1wYlinflZ5qU/3 P+QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1K9fi6Xx37iZyQGb7OY2IW9xvd7fU8g/SzlW0wuyxu8=; b=qbAVYEnE83pvbiBLZlKqLtVGkGEqM9rv4dMuFXXLOnM6oGhlHg5jioTuq35Sxluj/j ZrOnUjyUQNVEFEz5sVyB+2MKtUth1icREF7c1Cd0HD7MGgqDnLZdAowcAcB+MqwMD2aG ibkunt9/t7WBgwlWiFmtSnCyBOo4ueMG3VXffu4Ip4yZGcRWt5M+b+hxVZ/H9XlB2C0J m0drui3trGJ0HMX5MELEJ6DTLpq5LHcC1TbiPtRr+JDPiKj0+2oqEKpxeGuaaXK+ffND fBL9ufiLjngGQVzUdcxCsCo3OK5btQW/z3tDsdpeadNB9I/Q+NEsHaTdJqg4IPsFKOXl I8Ww== X-Gm-Message-State: APf1xPAcqCrEejmAEmdp9cZPe6Bge5u2eK+fy6LFHH/s9ZnB/gCUtgRG JLCYJUt9b03fOukjnTW9huE= X-Google-Smtp-Source: AH8x227+UyMKLRzR6KeT3ukF+LlevPsyvxccfKmUP35xtFpIgh0ILs9ImWC3RUs8wtDrcmY4CzrFYg== X-Received: by 10.223.167.3 with SMTP id c3mr6316006wrd.197.1518022040287; Wed, 07 Feb 2018 08:47:20 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id j77sm6106519wmf.37.2018.02.07.08.47.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2018 08:47:19 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Keith Wiles , dpdk stable Date: Wed, 7 Feb 2018 16:46:34 +0000 Message-Id: <20180207164705.29052-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180207164705.29052-1-luca.boccassi@gmail.com> References: <20180126131332.15346-62-luca.boccassi@gmail.com> <20180207164705.29052-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'mbuf: fix NULL freeing when debug enabled' has been queued to LTS release 16.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Feb 2018 16:47:20 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/09/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 59286a230c19a32fa945407625873b4cdb144099 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Mon, 29 Jan 2018 10:39:23 +0100 Subject: [PATCH] mbuf: fix NULL freeing when debug enabled [ upstream commit 9f8d9b2ee358c496fe206d1e6f111067afd501b3 ] Do not panic when calling rte_pktmbuf_free(NULL) with mbuf debug enabled, it is a valid operation. Fixes: af75078fece3 ("first public release") 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 2de97a370..bc015d033 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1233,13 +1233,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.14.2