i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcom440x: Add missing NULL check.

Browse Source 
Fixes #4293 (again.)
This commit is contained in:
Augustin Cavalier
2018-12-16 17:14:46 -05:00
parent b3fd8cd82a
commit 18016b9654
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/broadcom440x/dev/bfe/if_bfe.c
+4 -2
View File
@@ -793,6 +793,8 @@ bfe_list_newbuf(struct bfe_softc *sc, int c)
int nsegs; int nsegs;
m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (!m)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES; m->m_len = m->m_pkthdr.len = MCLBYTES;
if (bus_dmamap_load_mbuf_sg(sc->bfe_rxmbuf_tag, sc->bfe_rx_sparemap, if (bus_dmamap_load_mbuf_sg(sc->bfe_rxmbuf_tag, sc->bfe_rx_sparemap,
@@ -817,7 +819,7 @@ bfe_list_newbuf(struct bfe_softc *sc, int c)
rx_header->len = 0; rx_header->len = 0;
rx_header->flags = 0; rx_header->flags = 0;
bus_dmamap_sync(sc->bfe_rxmbuf_tag, r->bfe_map, BUS_DMASYNC_PREREAD); bus_dmamap_sync(sc->bfe_rxmbuf_tag, r->bfe_map, BUS_DMASYNC_PREREAD);
ctrl = segs[0].ds_len & BFE_DESC_LEN; ctrl = segs[0].ds_len & BFE_DESC_LEN;
KASSERT(ctrl > ETHER_MAX_LEN + 32, ("%s: buffer size too small(%d)!", KASSERT(ctrl > ETHER_MAX_LEN + 32, ("%s: buffer size too small(%d)!",
__func__, ctrl)); __func__, ctrl));
@@ -1400,7 +1402,7 @@ bfe_rxeof(struct bfe_softc *sc)
* Rx status should be read from mbuf such that we can't * Rx status should be read from mbuf such that we can't
* delay bus_dmamap_sync(9). This hardware limiation * delay bus_dmamap_sync(9). This hardware limiation
* results in inefficent mbuf usage as bfe(4) couldn't * results in inefficent mbuf usage as bfe(4) couldn't
* reuse mapped buffer from errored frame. * reuse mapped buffer from errored frame.
*/ */
if (bfe_list_newbuf(sc, cons) != 0) { if (bfe_list_newbuf(sc, cons) != 0) {
if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1);