Skip to contentSkip to conversation

power_supply: pm2301_charger: Fix NULL pointer dereference

PATCH Applied Axel Lin 3 participants 3 messages May 16, 2013 – Jun 7, 2013

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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.

---
 drivers/power/pm2301_charger.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/power/pm2301_charger.c +6 -1
index a441751..c972389 100644
@@ -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;
 	}
 
Signature · 1 line
1.8.1.2