lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pnp: card_probe(): fix memory leak

Browse Source 
We can leak `clink' if drv->probe == 0.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl
2006-06-25 05:47:17 -07:00
committed by Linus Torvalds
parent 552c03483e
commit a9adb8dbcd
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pnp/card.c
View File

@@ -62,28 +62,32 @@ static void card_remove_first(struct pnp_dev * dev)
static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv) static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
{ {
const struct pnp_card_device_id *id = match_card(drv,card); const struct pnp_card_device_id *id;
if (id) { struct pnp_card_link *clink;
struct pnp_card_link * clink = pnp_alloc(sizeof(struct pnp_card_link)); struct pnp_dev *dev;
if (!drv->probe)
return 0;
id = match_card(drv,card);
if (!id)
return 0;
clink = pnp_alloc(sizeof(*clink));
if (!clink) if (!clink)
return 0; return 0;
clink->card = card; clink->card = card;
clink->driver = drv; clink->driver = drv;
clink->pm_state = PMSG_ON; clink->pm_state = PMSG_ON;
if (drv->probe) {
if (drv->probe(clink, id) >= 0) if (drv->probe(clink, id) >= 0)
return 1; return 1;
else {
struct pnp_dev * dev; /* Recovery */
card_for_each_dev(card, dev) { card_for_each_dev(card, dev) {
if (dev->card_link == clink) if (dev->card_link == clink)
pnp_release_card_device(dev); pnp_release_card_device(dev);
} }
kfree(clink); kfree(clink);
}
} else
return 1;
}
return 0; return 0;
} }