diff options
| author | hselasky <hselasky@FreeBSD.org> | 2016-11-07 08:36:06 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2016-11-07 08:36:06 +0000 |
| commit | ea512fc24698cb90f6b4456e0a76fba1ca994e3a (patch) | |
| tree | 54be7a70e07f49ecc9474f9c6f165a7812292e09 /sys/arm/at91 | |
| parent | 7fa1d4ac3f1e9c0244c9fea96875bb5b6b0bc8ce (diff) | |
| download | FreeBSD-src-ea512fc24698cb90f6b4456e0a76fba1ca994e3a.zip FreeBSD-src-ea512fc24698cb90f6b4456e0a76fba1ca994e3a.tar.gz | |
MFC r307518:
Fix device delete child function.
When detaching device trees parent devices must be detached prior to
detaching its children. This is because parent devices can have
pointers to the child devices in their softcs which are not
invalidated by device_delete_child(). This can cause use after free
issues and panic().
Device drivers implementing trees, must ensure its detach function
detaches or deletes all its children before returning.
While at it remove now redundant device_detach() calls before
device_delete_child() and device_delete_children(), mostly in
the USB controller drivers.
Tested by: Jan Henrik Sylvester <me@janh.de>
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D8070
Diffstat (limited to 'sys/arm/at91')
| -rw-r--r-- | sys/arm/at91/at91_ohci.c | 6 | ||||
| -rw-r--r-- | sys/arm/at91/at91_ohci_fdt.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sys/arm/at91/at91_ohci.c b/sys/arm/at91/at91_ohci.c index 3e39f51..4d8e301 100644 --- a/sys/arm/at91/at91_ohci.c +++ b/sys/arm/at91/at91_ohci.c @@ -165,14 +165,8 @@ static int ohci_atmelarm_detach(device_t dev) { struct at91_ohci_softc *sc = device_get_softc(dev); - device_t bdev; int err; - if (sc->sc_ohci.sc_bus.bdev) { - bdev = sc->sc_ohci.sc_bus.bdev; - device_detach(bdev); - device_delete_child(dev, bdev); - } /* during module unload there are lots of children leftover */ device_delete_children(dev); diff --git a/sys/arm/at91/at91_ohci_fdt.c b/sys/arm/at91/at91_ohci_fdt.c index de3d357..51d9509 100644 --- a/sys/arm/at91/at91_ohci_fdt.c +++ b/sys/arm/at91/at91_ohci_fdt.c @@ -171,14 +171,8 @@ static int ohci_at91_fdt_detach(device_t dev) { struct at91_ohci_softc *sc = device_get_softc(dev); - device_t bdev; int err; - if (sc->sc_ohci.sc_bus.bdev) { - bdev = sc->sc_ohci.sc_bus.bdev; - device_detach(bdev); - device_delete_child(dev, bdev); - } /* during module unload there are lots of children leftover */ device_delete_children(dev); |
