linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sachin Kamat <sachin.kamat@linaro.org>
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: Wed, 30 Oct 2013 17:13:45 +0530	[thread overview]
Message-ID: <1383133430-22079-2-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1383133430-22079-1-git-send-email-sachin.kamat@linaro.org>

'of_id' is dereferenced before NULL pointer check. Move it to
after the check.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Tony Prisk <linux@prisktech.co.nz>
---
 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 e902ed7..498d1f7 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;
-- 
1.7.9.5


  reply	other threads:[~2013-10-30 11:45 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-30 11:43 [PATCH Resend 1/7] mmc: ushc: Fix incorrect parameter in sizeof Sachin Kamat
2013-10-30 11:43 ` Sachin Kamat [this message]
2013-10-30 11:43 ` [PATCH Resend 3/7] mmc: sdhci-spear: Fix NULL pointer dereference Sachin Kamat
2013-10-30 11:43 ` [PATCH Resend 4/7] mmc: davinci: Remove redundant of_match_ptr Sachin Kamat
2013-10-30 11:43 ` [PATCH Resend 5/7] mmc: dw_mmc: " Sachin Kamat
2013-10-30 11:43 ` [PATCH Resend 6/7] mmc: sdhci-dove: " Sachin Kamat
2013-10-30 11:43 ` [PATCH Resend 7/7] mmc: dw_mmc: Add missing description Sachin Kamat
2013-11-27  3:05 ` [PATCH Resend 1/7] mmc: ushc: Fix incorrect parameter in sizeof Sachin Kamat
  -- strict thread matches above, loose matches on Subject: below --
2013-12-19  8:43 Sachin Kamat
2013-12-19  8:43 ` [PATCH Resend 2/7] mmc: wmt-sdmmc: Fix NULL pointer dereference Sachin Kamat

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383133430-22079-2-git-send-email-sachin.kamat@linaro.org \
    --to=sachin.kamat@linaro.org \
    --cc=cjb@laptop.org \
    --cc=linux-mmc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).