Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627Ab2KEGqx (ORCPT ); Mon, 5 Nov 2012 01:46:53 -0500 Received: from mail-vc0-f174.google.com ([209.85.220.174]:55896 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699Ab2KEGqw (ORCPT ); Mon, 5 Nov 2012 01:46:52 -0500 From: Xi Wang To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xi Wang Subject: [PATCH] mm: fix NULL checking in dma_pool_create() Date: Mon, 5 Nov 2012 01:46:36 -0500 Message-Id: <1352097996-25808-1-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1198 Lines: 40 First, `dev' is dereferenced in dev_to_node(dev), suggesting that it must be non-null. Later `dev' is checked against NULL, suggesting the opposite. This patch adds a NULL check before its use. Signed-off-by: Xi Wang --- mm/dmapool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index c5ab33b..afbf88e 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -135,6 +135,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, { struct dma_pool *retval; size_t allocation; + int node; if (align == 0) { align = 1; @@ -159,7 +160,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, return NULL; } - retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, dev_to_node(dev)); + node = dev ? dev_to_node(dev) : -1; + + retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, node); if (!retval) return retval; -- 1.7.10.4 -- 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/