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
This commit is contained in:
Robert Watson 2006-03-28 10:16:38 +00:00
parent b3efbabe87
commit 85f1f481ab

View File

@ -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 {