From patchwork Sat Jun 22 00:02:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fernandes, Joel A" X-Patchwork-Id: 2765121 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89A06C0AB1 for ; Sat, 22 Jun 2013 00:04:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF520201A2 for ; Sat, 22 Jun 2013 00:04:07 +0000 (UTC) Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1CB9201A1 for ; Sat, 22 Jun 2013 00:04:06 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r5M02s7k027963; Fri, 21 Jun 2013 19:02:54 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r5M02s0p019587; Fri, 21 Jun 2013 19:02:54 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Fri, 21 Jun 2013 19:02:53 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r5M02qJ1017942; Fri, 21 Jun 2013 19:02:52 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id B87C180627; Fri, 21 Jun 2013 19:02:52 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv90.itg.ti.com (dlelxv90.itg.ti.com [172.17.2.17]) by linux.omap.com (Postfix) with ESMTP id 2714080626 for ; Fri, 21 Jun 2013 19:02:51 -0500 (CDT) Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r5M02pbh019557; Fri, 21 Jun 2013 19:02:51 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Fri, 21 Jun 2013 19:02:50 -0500 Received: from localhost.localdomain (lta0273324-128247106216.am.dhcp.ti.com [128.247.106.216]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r5M02m0D029819; Fri, 21 Jun 2013 19:02:50 -0500 From: Joel A Fernandes To: Tony Lindgren , Sekhar Nori , Matt Porter , Grant Likely , Rob Herring , Vinod Koul , Mark Brown , Benoit Cousson , Russell King , Rob Landley , Andrew Morton , Jason Kridner , Koen Kooi Subject: [PATCH] ARM: common: edma: Fix dangling pointer dereference Date: Fri, 21 Jun 2013 19:02:48 -0500 Message-ID: <1371859368-16063-1-git-send-email-joelagnel@ti.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 CC: Joel A Fernandes , Linux DaVinci Kernel List , Arnd Bergmann , Linux Documentation List , Devicetree Discuss , Linux MMC List , Linux Kernel Mailing List , Linux SPI Devel List , Linux OMAP List , Linux ARM Kernel List X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Returning a pointer to a variable in the setup_from_dt function is causing dangling pointer dereferences. This causes boot to fail on AM33XX. Add ninfo to the caller's stack and just return the kzalloc'ed ptr from the calling function. Seen on linux-davinci/soc-v2 branch. Cc: Sekhar Nori Signed-off-by: Joel A Fernandes --- arch/arm/common/edma.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index 2b591b1..f913e82 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c @@ -1514,10 +1514,9 @@ static struct of_dma_filter_info edma_filter_info = { .filter_fn = edma_filter_fn, }; -static struct edma_soc_info **edma_setup_info_from_dt(struct device *dev, +static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev, struct device_node *node) { - static struct edma_soc_info **info; struct edma_soc_info *ninfo; int ret; @@ -1539,9 +1538,7 @@ static struct edma_soc_info **edma_setup_info_from_dt(struct device *dev, of_dma_controller_register(dev->of_node, of_dma_simple_xlate, &edma_filter_info); - info = &ninfo; - - return info; + return ninfo; } #else static struct edma_soc_info **edma_setup_info_from_dt(struct device *dev, @@ -1554,6 +1551,7 @@ static struct edma_soc_info **edma_setup_info_from_dt(struct device *dev, static int edma_probe(struct platform_device *pdev) { struct edma_soc_info **info = pdev->dev.platform_data; + struct edma_soc_info *ninfo[EDMA_MAX_CC] = {NULL}; s8 (*queue_priority_mapping)[2]; s8 (*queue_tc_mapping)[2]; int i, j, off, ln, found = 0; @@ -1572,7 +1570,7 @@ static int edma_probe(struct platform_device *pdev) int ret; if (node) { - info = edma_setup_info_from_dt(dev, node); + ninfo[0] = edma_setup_info_from_dt(dev, node); if (IS_ERR(info)) { dev_err(dev, "failed to get DT data\n"); return PTR_ERR(info);