d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent double-free, also use the same error codes as OpenBSD.

Browse Source
This commit is contained in:
Bernhard Schmidt 2011-04-16 11:11:22 +00:00
parent 47c2ecefcc
commit 0df53de1c3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/iwn/if_iwn.c
View File

@ -1294,7 +1294,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring)
if (data->m == NULL) { if (data->m == NULL) {
device_printf(sc->sc_dev, device_printf(sc->sc_dev,
"%s: could not allocate rx mbuf\n", __func__); "%s: could not allocate rx mbuf\n", __func__);
error = ENOMEM; error = ENOBUFS;
goto fail; goto fail;
} }
@ -1305,8 +1305,6 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring)
device_printf(sc->sc_dev, device_printf(sc->sc_dev,
"%s: bus_dmamap_load failed, error %d\n", "%s: bus_dmamap_load failed, error %d\n",
__func__, error); __func__, error);
m_freem(data->m);
error = ENOMEM; /* XXX unique code */
goto fail; goto fail;
} }
@ -1361,6 +1359,7 @@ iwn_free_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring)
BUS_DMASYNC_POSTREAD); BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(ring->data_dmat, data->map); bus_dmamap_unload(ring->data_dmat, data->map);
m_freem(data->m); m_freem(data->m);
data->m = NULL;
} }
if (data->map != NULL) if (data->map != NULL)
bus_dmamap_destroy(ring->data_dmat, data->map); bus_dmamap_destroy(ring->data_dmat, data->map);