diff options
author | ru <ru@FreeBSD.org> | 2005-09-16 11:11:51 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2005-09-16 11:11:51 +0000 |
commit | d2f7ab28daf6bc7f93eb290728f89c7d713ca0ce (patch) | |
tree | eea8401041be885ba31c07333f6e0206b9d04ab0 /sys/pci/if_sis.c | |
parent | 02dbbd7982679f0c66e9ffa29caf799b5c1a3bde (diff) | |
download | FreeBSD-src-d2f7ab28daf6bc7f93eb290728f89c7d713ca0ce.zip FreeBSD-src-d2f7ab28daf6bc7f93eb290728f89c7d713ca0ce.tar.gz |
Fix "struct ifnet" leaks when attach() fails in the middle, e.g.
when mii_phy_probe() or bus_setup_intr() fails. For drivers that
call their detach() in this case, call if_free() there to cover
this case too.
Diffstat (limited to 'sys/pci/if_sis.c')
-rw-r--r-- | sys/pci/if_sis.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 469ab02..ab4a121 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1220,7 +1220,6 @@ sis_attach(device_t dev) if (mii_phy_probe(dev, &sc->sis_miibus, sis_ifmedia_upd, sis_ifmedia_sts)) { printf("sis%d: MII without any PHY!\n", sc->sis_unit); - if_free(ifp); error = ENXIO; goto fail; } @@ -1248,7 +1247,6 @@ sis_attach(device_t dev) if (error) { printf("sis%d: couldn't set up irq\n", unit); ether_ifdetach(ifp); - if_free(ifp); goto fail; } @@ -1282,8 +1280,9 @@ sis_detach(device_t dev) sis_reset(sc); sis_stop(sc); ether_ifdetach(ifp); - if_free(ifp); } + if (ifp) + if_free(ifp); if (sc->sis_miibus) device_delete_child(dev, sc->sis_miibus); bus_generic_detach(dev); |