redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

mtd/maps/pismo: remove dangling pointer and a leak

Browse source 
While looking for drivers which forgot to clear i2c_clientdata before freeing
the data structure it points to, I found that the pismo driver even has a leak
on the probe error path.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Wolfram Sang 2010-03-20 15:31:46 +00:00 committed by David Woodhouse
parent 4d682420ce
commit 395b228858
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mtd/maps/pismo.c
View file

@ -233,6 +233,7 @@ static int __devexit pismo_remove(struct i2c_client *client)
/* FIXME: set_vpp needs saner arguments */
pismo_setvpp_remove_fix(pismo);
i2c_set_clientdata(client, NULL);
kfree(pismo);
return 0;
@ -271,7 +272,7 @@ static int __devinit pismo_probe(struct i2c_client *client,
ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom));
if (ret < 0) {
dev_err(&client->dev, "error reading EEPROM: %d\n", ret);
return ret;
goto exit_free;
}
dev_info(&client->dev, "%.15s board found\n", eeprom.board);
@ -282,6 +283,11 @@ static int __devinit pismo_probe(struct i2c_client *client,
pdata->cs_addrs[i]);
return 0;
exit_free:
i2c_set_clientdata(client, NULL);
kfree(pismo);
return ret;
}
static const struct i2c_device_id pismo_id[] = {