Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933196AbbFIMGk (ORCPT ); Tue, 9 Jun 2015 08:06:40 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34945 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932907AbbFIMGK (ORCPT ); Tue, 9 Jun 2015 08:06:10 -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 5/5] mm/zsmalloc: allow NULL `pool' pointer in zs_destroy_pool() Date: Tue, 9 Jun 2015 21:04:53 +0900 Message-Id: <1433851493-23685-6-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: 1244 Lines: 41 zpool_destroy_pool() does not tolerate a NULL zs_pool pointer argument and performs a NULL-pointer dereference. Although there are quite a few zs_destroy_pool() users, still update it to be coherent with the corresponding destroy() functions of the remainig pool-allocators (slab, mempool, etc.), which now allow NULL pool-pointers. For consistency, tweak zpool_destroy_pool() 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/zsmalloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c766240..80964d2 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1868,6 +1868,9 @@ void zs_destroy_pool(struct zs_pool *pool) { int i; + if (unlikely(!pool)) + return; + zs_pool_stat_destroy(pool); for (i = 0; i < zs_size_classes; i++) { -- 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/