2013-05-16 09:31:14

by Axel Lin

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 <[email protected]>
---
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

2013-05-17 13:45:57

by Linus Walleij

Subject: Re: [PATCH] power_supply: pm2301_charger: Fix NULL pointer dereference

On Thu, May 16, 2013 at 11:31 AM, Axel Lin <[email protected]> wrote:

> 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 <[email protected]>

Acked-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij

2013-06-07 00:31:05

by Anton Vorontsov

Subject: Re: [PATCH] power_supply: pm2301_charger: Fix NULL pointer dereference

On Fri, May 17, 2013 at 03:45:55PM +0200, Linus Walleij wrote:
> On Thu, May 16, 2013 at 11:31 AM, Axel Lin <[email protected]> wrote:
>
> > 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 <[email protected]>
>
> Acked-by: Linus Walleij <[email protected]>

Applied, thanks!

Anton