diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-03-28 10:16:38 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-03-28 10:16:38 +0000 |
| commit | 61ae660ca77ea2033c02a8dfb4e0b511d19c1e18 (patch) | |
| tree | f8459c2caea795d35525159148ea3ed44f89db08 /sys/netinet6/ipsec.c | |
| parent | ea21aeb859f46508f312c308e5862f2956644748 (diff) | |
| download | FreeBSD-src-61ae660ca77ea2033c02a8dfb4e0b511d19c1e18.zip FreeBSD-src-61ae660ca77ea2033c02a8dfb4e0b511d19c1e18.tar.gz | |
Remove manual assignment of m_pkthdr from one mbuf to another in
ipsec_copypkt(), as this is already handled by the call to M_MOVE_PKTHDR(),
which also knows how to correctly handle MAC m_tags. This corrects a panic
when running with MAC and KAME IPSEC.
PR: kern/94599
Submitted by: zhouyi zhou <zhouyi04 at ios dot cn>
Reviewed by: bz
MFC after: 3 days
Diffstat (limited to 'sys/netinet6/ipsec.c')
| -rw-r--r-- | sys/netinet6/ipsec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index aa710a2..aa347ec 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -3469,15 +3469,6 @@ ipsec_copypkt(m) MGETHDR(mnew, M_DONTWAIT, MT_HEADER); if (mnew == NULL) goto fail; - mnew->m_pkthdr = n->m_pkthdr; -#if 0 - /* XXX: convert to m_tag or delete? */ - if (n->m_pkthdr.aux) { - mnew->m_pkthdr.aux = - m_copym(n->m_pkthdr.aux, - 0, M_COPYALL, M_DONTWAIT); - } -#endif M_MOVE_PKTHDR(mnew, n); } else { |
