hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/pnp/card.c
View File

@ -60,30 +60,34 @@ static void card_remove_first(struct pnp_dev * dev)
card_remove(dev); card_remove(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 (!clink)
return 0; if (!drv->probe)
clink->card = card; return 0;
clink->driver = drv; id = match_card(drv,card);
clink->pm_state = PMSG_ON; if (!id)
if (drv->probe) { return 0;
if (drv->probe(clink, id)>=0)
return 1; clink = pnp_alloc(sizeof(*clink));
else { if (!clink)
struct pnp_dev * dev; return 0;
card_for_each_dev(card, dev) { clink->card = card;
if (dev->card_link == clink) clink->driver = drv;
pnp_release_card_device(dev); clink->pm_state = PMSG_ON;
}
kfree(clink); if (drv->probe(clink, id) >= 0)
} return 1;
} else
return 1; /* Recovery */
card_for_each_dev(card, dev) {
if (dev->card_link == clink)
pnp_release_card_device(dev);
} }
kfree(clink);
return 0; return 0;
} }