Author: csjp
Date: Mon Oct 13 17:33:44 2008
New Revision: 183826
URL: http://svn.freebsd.org/changeset/base/183826
Log:
MFC change 182311
Fix panics with MAC kernels when a labeled security policy is used
and IP options are present on an mbuf.
Approved by: re (kib)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/netinet/ip_options.c
Modified: stable/7/sys/netinet/ip_options.c
==============================================================================
--- stable/7/sys/netinet/ip_options.c Mon Oct 13 17:14:29 2008
(r183825)
+++ stable/7/sys/netinet/ip_options.c Mon Oct 13 17:33:44 2008
(r183826)
@@ -508,9 +508,6 @@ ip_insertoptions(struct mbuf *m, struct
}
M_MOVE_PKTHDR(n, m);
n->m_pkthdr.rcvif = NULL;
-#ifdef MAC
- mac_copy_mbuf(m, n);
-#endif
n->m_pkthdr.len += optlen;
m->m_len -= sizeof(struct ip);
m->m_data += sizeof(struct ip);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
