From e026b96386aea55bea66bf958610ccd14e92cb3d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 21 Jan 2009 18:17:47 +0000 Subject: 2009-01-21 Frank Ueberschar PR 1354/bsps * network/network.c: In some cases it can occur that an empty mbuf is put on the descriptor chain. (We found it especially then when transmitting fragmented IP Packets.) Since the actual buffer descriptor pointer will be incremented after every inserted mbuf (txBd = sc->txBdBase + sc->txBdHead;) even if m->m_len of the current mbuf was zero. This leads to the bug. --- c/src/lib/libbsp/m68k/av5282/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/av5282/network/network.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 5aebf207cc..70a8bb557e 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,13 @@ +2009-01-21 Frank Ueberschar + + PR 1354/bsps + * network/network.c: In some cases it can occur that an empty mbuf is + put on the descriptor chain. (We found it especially then when + transmitting fragmented IP Packets.) Since the actual buffer + descriptor pointer will be incremented after every inserted mbuf + (txBd = sc->txBdBase + sc->txBdHead;) even if m->m_len of the current + mbuf was zero. This leads to the bug. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c index 7575072425..2dcf1d1e04 100644 --- a/c/src/lib/libbsp/m68k/av5282/network/network.c +++ b/c/src/lib/libbsp/m68k/av5282/network/network.c @@ -548,10 +548,10 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m) * The IP fragmentation routine in ip_output * can produce fragments with zero length. */ - txBd = sc->txBdBase + sc->txBdHead; if (m->m_len){ char *p = mtod(m, char *); int offset = (int) p & 0x3; + txBd = sc->txBdBase + sc->txBdHead; if (offset == 0) { txBd->buffer = p; txBd->length = m->m_len; -- cgit v1.2.3