From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [PATCH 4/4] regulator/wm8994-regulator: fix potential NULL dereference
Date: Fri, 20 Aug 2010 10:02:41 +0800 [thread overview]
Message-ID: <1282269761.31048.8.camel@mola> (raw)
In-Reply-To: <1282269518.31048.2.camel@mola>
pdata is dereferenced earlier than tested for being NULL.
Thus move the dereference of "pdata" below the check for NULL.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/regulator/wm8994-regulator.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 03713bc..3ecc81f 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -202,15 +202,15 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
{
struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
struct wm8994_pdata *pdata = wm8994->dev->platform_data;
- int id = pdev->id % ARRAY_SIZE(pdata->ldo);
struct wm8994_ldo *ldo;
- int ret;
-
- dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
+ int id, ret;
if (!pdata)
return -ENODEV;
+ id = pdev->id % ARRAY_SIZE(pdata->ldo);
+ dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
+
ldo = kzalloc(sizeof(struct wm8994_ldo), GFP_KERNEL);
if (ldo == NULL) {
dev_err(&pdev->dev, "Unable to allocate private data\n");
--
1.7.2
next prev parent reply other threads:[~2010-08-20 1:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-20 1:58 [PATCH 1/4] regulator/wm831x-dcdc: fix potential NULL dereference Axel Lin
2010-08-20 1:59 ` [PATCH 2/4] regulator/wm831x-isink: " Axel Lin
2010-08-20 2:01 ` [PATCH 3/4] regulator/wm831x-ldo: " Axel Lin
2010-08-20 2:02 ` Axel Lin [this message]
2010-08-20 9:03 ` [PATCH 1/4] regulator/wm831x-dcdc: " Mark Brown
2010-08-20 15:43 ` Axel Lin
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=1282269761.31048.8.camel@mola \
--to=axel.lin@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.