Fix for use after free.

MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2014-07-01 07:13:41 +00:00
parent 29441ba3fa
commit 31136808a4

View File

@ -559,8 +559,6 @@ uhso_attach(device_t self)
mtx_init(&sc->sc_mtx, "uhso", NULL, MTX_DEF);
ucom_ref(&sc->sc_super_ucom);
sc->sc_ucom = NULL;
sc->sc_ttys = 0;
sc->sc_radio = 1;
id = usbd_get_interface_descriptor(uaa->iface);
@ -680,9 +678,6 @@ uhso_detach(device_t self)
UHSO_CTRL_MAX);
}
}
free(sc->sc_tty, M_USBDEV);
free(sc->sc_ucom, M_USBDEV);
}
if (sc->sc_ifp != NULL) {
@ -710,6 +705,8 @@ static void
uhso_free_softc(struct uhso_softc *sc)
{
if (ucom_unref(&sc->sc_super_ucom)) {
free(sc->sc_tty, M_USBDEV);
free(sc->sc_ucom, M_USBDEV);
mtx_destroy(&sc->sc_mtx);
device_free_softc(sc);
}