Date: Mon, 13 Oct 2008 17:33:44 +0000 (UTC) From: "Christian S.J. Peron" <csjp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r183826 - in stable/7/sys: . netinet Message-ID: <200810131733.m9DHXibj081763@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810131733.m9DHXibj081763>