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/dev/dc | |
| 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/dev/dc')
| -rw-r--r-- | sys/dev/dc/if_dc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 1dab374..8a9e8c6 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2310,7 +2310,6 @@ dc_attach(device_t dev) if (error) { device_printf(dev, "couldn't set up irq\n"); ether_ifdetach(ifp); - if_free(ifp); goto fail; } @@ -2347,8 +2346,9 @@ dc_detach(device_t dev) DC_UNLOCK(sc); callout_drain(&sc->dc_stat_ch); ether_ifdetach(ifp); - if_free(ifp); } + if (ifp) + if_free(ifp); if (sc->dc_miibus) device_delete_child(dev, sc->dc_miibus); bus_generic_detach(dev); |
