From patchwork Thu Dec 19 08:43:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3375701 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 579E99F344 for ; Thu, 19 Dec 2013 08:46:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 457112060F for ; Thu, 19 Dec 2013 08:46:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 748E22060E for ; Thu, 19 Dec 2013 08:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832Ab3LSIqy (ORCPT ); Thu, 19 Dec 2013 03:46:54 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:59390 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813Ab3LSIqy (ORCPT ); Thu, 19 Dec 2013 03:46:54 -0500 Received: by mail-pa0-f47.google.com with SMTP id kq14so873502pab.20 for ; Thu, 19 Dec 2013 00:46:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0O9Qx8ZSjLR5Ndn8f7KCZGhjQrDqdlfD+0m1W8Hzf4E=; b=jjrw4He4KFEemq8x7t5KQMnhSLH+Ei+22HmhmrC0eJrkxgJyCvHBujK3Fq1LxOkr+V kSrhHjV2LItPgr3iGzt2evrPJo+rDkCDl9a/+z7RJ8xR5Y6+EjmNzu4QPYSOJGhCFLhT sOgQl/VksCUeioq+9bcX+/LIaN6kbWi3GqxbMltC/2bUp5pUT0H8PAzr5PPVow6SJ3oK uUMewz7nO9RvjVBHl+ywb4owfyYlsr/Nfm6gDCaTj2sh4kkbRUeFoaaMFhlxDiFSImWz dAXp8LwX67gaPLKP3TBqfKIUOtNFQxV2qB0axizQheY9oRTB51mbA5kU18svYU32S21g 2p/g== X-Gm-Message-State: ALoCoQnQ5yRd1FmxWszHjAlah0eaOmVKM8MfCSYxfdZoHgGSm4yvkONYYSo9n8jiW3i5vSsvAdFq X-Received: by 10.67.21.130 with SMTP id hk2mr351051pad.76.1387442813875; Thu, 19 Dec 2013 00:46:53 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id oc9sm5520341pbb.10.2013.12.19.00.46.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 00:46:53 -0800 (PST) From: Sachin Kamat To: linux-mmc@vger.kernel.org Cc: cjb@laptop.org, sachin.kamat@linaro.org Subject: [PATCH Resend 2/7] mmc: wmt-sdmmc: Fix NULL pointer dereference Date: Thu, 19 Dec 2013 14:13:29 +0530 Message-Id: <1387442614-4193-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387442614-4193-1-git-send-email-sachin.kamat@linaro.org> References: <1387442614-4193-1-git-send-email-sachin.kamat@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 'of_id' is dereferenced before NULL pointer check. Move it to after the check. Signed-off-by: Sachin Kamat Acked-by: Tony Prisk --- drivers/mmc/host/wmt-sdmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c index e902ed7846b0..498d1f799085 100644 --- a/drivers/mmc/host/wmt-sdmmc.c +++ b/drivers/mmc/host/wmt-sdmmc.c @@ -757,7 +757,7 @@ static int wmt_mci_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(wmt_mci_dt_ids, &pdev->dev); - const struct wmt_mci_caps *wmt_caps = of_id->data; + const struct wmt_mci_caps *wmt_caps; int ret; int regular_irq, dma_irq; @@ -766,6 +766,8 @@ static int wmt_mci_probe(struct platform_device *pdev) return -EFAULT; } + wmt_caps = of_id->data; + if (!np) { dev_err(&pdev->dev, "Missing SDMMC description in devicetree\n"); return -EFAULT;