Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935383Ab3DOIkP (ORCPT ); Mon, 15 Apr 2013 04:40:15 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:42006 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933589Ab3DOIkN (ORCPT ); Mon, 15 Apr 2013 04:40:13 -0400 From: Paolo Pisati To: Vinod Koul Cc: Dan Williams , Grant Likely , Rob Herring , linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Paolo Pisati Subject: [PATCH] dma: of-dma: check OF pointer property before dereferencing it Date: Mon, 15 Apr 2013 10:39:53 +0200 Message-Id: <1366015193-6627-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366015193-6627-1-git-send-email-paolo.pisati@canonical.com> References: <1366015193-6627-1-git-send-email-paolo.pisati@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1175 Lines: 38 Signed-off-by: Paolo Pisati --- drivers/dma/of-dma.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index 69d04d2..9628298 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -91,6 +91,7 @@ int of_dma_controller_register(struct device_node *np, (struct of_phandle_args *, struct of_dma *), void *data) { + void *parent; struct of_dma *ofdma; int nbcells; @@ -103,8 +104,10 @@ int of_dma_controller_register(struct device_node *np, if (!ofdma) return -ENOMEM; - nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL)); - if (!nbcells) { + parent = of_get_property(np, "#dma-cells", NULL); + if (parent) + nbcells = be32_to_cpup(parent); + if (!parent || !nbcells) { pr_err("%s: #dma-cells property is missing or invalid\n", __func__); kfree(ofdma); -- 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/