diff options
| author | yongari <yongari@FreeBSD.org> | 2006-08-12 01:24:37 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2006-08-12 01:24:37 +0000 |
| commit | 88c94f7a066113a020df0ee72d4030f30217047f (patch) | |
| tree | 273bc48388a0b6c71c62c8a94ea1f562a646ca05 /sys/dev/sk | |
| parent | c9f13fce81bceabdc304be6565e5ca3d7c7195d7 (diff) | |
| download | FreeBSD-src-88c94f7a066113a020df0ee72d4030f30217047f.zip FreeBSD-src-88c94f7a066113a020df0ee72d4030f30217047f.tar.gz | |
Fix invalid reference of mbuf chains.
Use proper pointer dereference to inform modified mbuf chains to
caller.
In collaboration with: glebius
Diffstat (limited to 'sys/dev/sk')
| -rw-r--r-- | sys/dev/sk/if_sk.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 184d7e8..dfc0e5e 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -2713,7 +2713,7 @@ sk_encap(sc_if, m_head) { struct sk_txdesc *txd; struct sk_tx_desc *f = NULL; - struct mbuf *m, *n; + struct mbuf *m; bus_dma_segment_t txsegs[SK_MAXTXSEGS]; u_int32_t cflags, frag, si, sk_ctl; int error, i, nseg; @@ -2723,29 +2723,28 @@ sk_encap(sc_if, m_head) if ((txd = STAILQ_FIRST(&sc_if->sk_cdata.sk_txfreeq)) == NULL) return (ENOBUFS); - m = *m_head; error = bus_dmamap_load_mbuf_sg(sc_if->sk_cdata.sk_tx_tag, - txd->tx_dmamap, m, txsegs, &nseg, 0); + txd->tx_dmamap, *m_head, txsegs, &nseg, 0); if (error == EFBIG) { - n = m_defrag(m, M_DONTWAIT); - if (n == NULL) { - m_freem(m); - m = NULL; + m = m_defrag(*m_head, M_DONTWAIT); + if (m == NULL) { + m_freem(*m_head); + *m_head = NULL; return (ENOMEM); } - m = n; + *m_head = m; error = bus_dmamap_load_mbuf_sg(sc_if->sk_cdata.sk_tx_tag, - txd->tx_dmamap, m, txsegs, &nseg, 0); + txd->tx_dmamap, *m_head, txsegs, &nseg, 0); if (error != 0) { - m_freem(m); - m = NULL; + m_freem(*m_head); + *m_head = NULL; return (error); } } else if (error != 0) return (error); if (nseg == 0) { - m_freem(m); - m = NULL; + m_freem(*m_head); + *m_head = NULL; return (EIO); } if (sc_if->sk_cdata.sk_tx_cnt + nseg >= SK_TX_RING_CNT) { @@ -2753,6 +2752,7 @@ sk_encap(sc_if, m_head) return (ENOBUFS); } + m = *m_head; if ((m->m_pkthdr.csum_flags & sc_if->sk_ifp->if_hwassist) != 0) cflags = SK_OPCODE_CSUM; else |
