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

don't reference a pkthdr after M_MOVE_PKTHDR has "remove it"; instead

Browse Source 
reference the pkthdr now in the destination of the move

Sponsored by:	Vernier Networks
This commit is contained in:
Sam Leffler 2003-01-06 21:33:54 +00:00
parent 0e7dea8326
commit 53d96a08a4
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if_loop.c
View File

@ -233,8 +233,8 @@ looutput(ifp, m, dst, rt)
goto contiguousfail;
}
m_copydata(m, 0, m->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = m->m_pkthdr.len;
m_copydata(m, 0, n->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = n->m_pkthdr.len;
m_freem(m);
m = n;
}

10
sys/netinet6/esp_input.c
View File

@ -814,7 +814,7 @@ noreplaycheck:
maxlen = MHLEN;
if (n)
M_MOVE_PKTHDR(n, m);
if (n && m->m_pkthdr.len > maxlen) {
if (n && n->m_pkthdr.len > maxlen) {
MCLGET(n, M_DONTWAIT);
maxlen = MCLBYTES;
if ((n->m_flags & M_EXT) == 0) {
@ -827,16 +827,14 @@ noreplaycheck:
goto bad;
}
if (m->m_pkthdr.len <= maxlen) {
m_copydata(m, 0, m->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = m->m_pkthdr.len;
n->m_pkthdr.len = m->m_pkthdr.len;
if (n->m_pkthdr.len <= maxlen) {
m_copydata(m, 0, n->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = n->m_pkthdr.len;
n->m_next = NULL;
m_freem(m);
} else {
m_copydata(m, 0, maxlen, mtod(n, caddr_t));
n->m_len = maxlen;
n->m_pkthdr.len = m->m_pkthdr.len;
n->m_next = m;
m_adj(m, maxlen);
}

6
sys/netinet6/ip6_input.c
View File

@ -320,7 +320,7 @@ ip6_input(m)
MGETHDR(n, M_DONTWAIT, MT_HEADER);
if (n)
M_MOVE_PKTHDR(n, m);
if (n && m->m_pkthdr.len > MHLEN) {
if (n && n->m_pkthdr.len > MHLEN) {
MCLGET(n, M_DONTWAIT);
if ((n->m_flags & M_EXT) == 0) {
m_freem(n);
@ -332,8 +332,8 @@ ip6_input(m)
return; /*ENOBUFS*/
}
m_copydata(m, 0, m->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = m->m_pkthdr.len;
m_copydata(m, 0, n->m_pkthdr.len, mtod(n, caddr_t));
n->m_len = n->m_pkthdr.len;
m_freem(m);
m = n;
}