diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2003-01-06 21:33:54 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2003-01-06 21:33:54 +0000 |
| commit | 53d96a08a4bb7051096f1bb2bb092c6ef6b7243e (patch) | |
| tree | 32e66c585db8ac5e6f1bda8784afcd281685e65b /sys/netinet6 | |
| parent | 0e7dea832625c32c59ea05d3a0cc49e43e326493 (diff) | |
Notes
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/esp_input.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c index ad40e648c067..d8de60c0ddf5 100644 --- a/sys/netinet6/esp_input.c +++ b/sys/netinet6/esp_input.c @@ -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); } diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 15a44bbc8c5b..1f37baec3873 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -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; } |