From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-mmc@vger.kernel.org
Cc: ulf.hansson@linaro.org, chris@printf.net, sachin.kamat@linaro.org
Subject: [PATCH 02/10] mmc: wmt-sdmmc: Fix NULL pointer dereference
Date: Tue, 25 Feb 2014 15:18:20 +0530 [thread overview]
Message-ID: <1393321708-9719-2-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1393321708-9719-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 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;
--
1.7.9.5
next prev parent reply other threads:[~2014-02-25 9:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 9:48 [PATCH Resend 01/10] mmc: ushc: Fix incorrect parameter in sizeof Sachin Kamat
2014-02-25 9:48 ` Sachin Kamat [this message]
2014-02-25 9:48 ` [PATCH 03/10] mmc: sdhci-spear: Fix NULL pointer dereference Sachin Kamat
2014-02-25 9:48 ` [PATCH 04/10] mmc: davinci: Remove redundant of_match_ptr Sachin Kamat
2014-02-25 9:48 ` [PATCH 05/10] mmc: dw_mmc: " Sachin Kamat
2014-02-25 9:48 ` [PATCH 06/10] mmc: sdhci-dove: " Sachin Kamat
2014-02-25 9:48 ` [PATCH 07/10] mmc: dw_mmc: Add missing description Sachin Kamat
2014-02-25 9:48 ` [PATCH 08/10] mmc: msm: Cleanup mmc-msm_sdcc.h header Sachin Kamat
2014-02-25 9:48 ` [PATCH 09/10] mmc: mvsdio: Cleanup mmc-mvsdio.h header Sachin Kamat
2014-02-25 9:48 ` [PATCH 10/10] mmc: dw_mmc: Fix NULL pointer dereference Sachin Kamat
2014-02-25 10:06 ` [PATCH Resend 01/10] mmc: ushc: Fix incorrect parameter in sizeof Ulf Hansson
2014-02-25 20:44 ` Chris Ball
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=1393321708-9719-2-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--cc=chris@printf.net \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.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).