Andrew Morton (on Sun, 14 May 2006 02:38:33 -0700) wrote:
>If !drv->probe then there's not much point in doing the kmalloc and then
>immediately freeing it again.
>
>Like this?
>
>--- devel/drivers/pnp/card.c~pnp-card_probe-fix-memory-leak 2006-05-14 02:30:25.000000000 -0700
>+++ devel-akpm/drivers/pnp/card.c 2006-05-14 02:36:24.000000000 -0700
>@@ -60,30 +60,34 @@ static void card_remove_first(struct pnp
> 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);
>- if (id) {
>- struct pnp_card_link * clink = pnp_alloc(sizeof(struct pnp_card_link));
>- if (!clink)
>- return 0;
>- clink->card = card;
>- clink->driver = drv;
>- clink->pm_state = PMSG_ON;
>- if (drv->probe) {
>- if (drv->probe(clink, id)>=0)
>- return 1;
>- else {
>- struct pnp_dev * dev;
>- card_for_each_dev(card, dev) {
>- if (dev->card_link == clink)
>- pnp_release_card_device(dev);
>- }
>- kfree(clink);
>- }
>- } else
>- return 1;
>+ const struct pnp_card_device_id *id;
>+ struct pnp_card_link *clink;
>+ 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)
>+ return 0;
>+ clink->card = card;
>+ clink->driver = drv;
>+ clink->pm_state = PMSG_ON;
Memory leak of clink on next test.
>+
>+ if (drv->probe(clink, id) >= 0)
>+ return 1;
>+
>+ /* Recovery */
>+ card_for_each_dev(card, dev) {
>+ if (dev->card_link == clink)
>+ pnp_release_card_device(dev);
> }
>+ kfree(clink);
> return 0;
> }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
