[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1368696660.8439.1.camel@phoenix>
Date: Thu, 16 May 2013 17:31:00 +0800
From: Axel Lin <axel.lin@...ics.com>
To: Anton Vorontsov <cbou@...l.ru>
Cc: Rupesh Kumar <rupesh.kumar@...ricsson.com>,
Michel JAOUEN <michel.jaouen@...ricsson.com>,
Loic Pallardy <loic.pallardy@...ricsson.com>,
David Woodhouse <dwmw2@...radead.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH] power_supply: pm2301_charger: Fix NULL pointer dereference
Add checking pl_data in probe, this prevent possible NULL pointer dereference.
Also fix NULL pointer deference in dev_err when allocate memory for pm2 fails.
Signed-off-by: Axel Lin <axel.lin@...ics.com>
---
drivers/power/pm2301_charger.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index a441751..c972389 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1007,9 +1007,14 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
u8 val;
int i;
+ if (!pl_data) {
+ dev_err(&i2c_client->dev, "No platform data supplied\n");
+ return -EINVAL;
+ }
+
pm2 = kzalloc(sizeof(struct pm2xxx_charger), GFP_KERNEL);
if (!pm2) {
- dev_err(pm2->dev, "pm2xxx_charger allocation failed\n");
+ dev_err(&i2c_client->dev, "pm2xxx_charger allocation failed\n");
return -ENOMEM;
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists