Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933294AbbFIMHV (ORCPT ); Tue, 9 Jun 2015 08:07:21 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35730 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932475AbbFIMFw (ORCPT ); Tue, 9 Jun 2015 08:05:52 -0400 From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Michal Hocko , David Rientjes , linux-mm@kvack.org, linux-kernel@vger.kernel.org, sergey.senozhatsky.work@gmail.com, Sergey Senozhatsky Subject: [RFC][PATCH 2/5] mm/mempool: allow NULL `pool' pointer in mempool_destroy() Date: Tue, 9 Jun 2015 21:04:50 +0900 Message-Id: <1433851493-23685-3-git-send-email-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.4.3.368.g7974889 In-Reply-To: <1433851493-23685-1-git-send-email-sergey.senozhatsky@gmail.com> References: <1433851493-23685-1-git-send-email-sergey.senozhatsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1285 Lines: 43 mempool_destroy() does not tolerate a NULL mempool_t pointer argument and performs a NULL-pointer dereference. This requires additional attention and effort from developers/reviewers and forces all mempool_destroy() callers to do a NULL check if (pool) mempool_destroy(pool); Or, otherwise, be invalid mempool_destroy() users. Tweak mempool_destroy() and NULL-check the pointer there. Proposed by Andrew Morton. Signed-off-by: Sergey Senozhatsky Reported-by: Andrew Morton LKML-reference: https://lkml.org/lkml/2015/6/8/583 --- mm/mempool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/mempool.c b/mm/mempool.c index 2cc08de..4c533bc 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -150,6 +150,9 @@ static void *remove_element(mempool_t *pool) */ void mempool_destroy(mempool_t *pool) { + if (unlikely(!pool)) + return; + while (pool->curr_nr) { void *element = remove_element(pool); pool->free(element, pool->pool_data); -- 2.4.3.368.g7974889 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/