From owner-svn-src-all@FreeBSD.ORG  Mon Oct 13 17:33:44 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D40331065688;
	Mon, 13 Oct 2008 17:33:44 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C21A58FC30;
	Mon, 13 Oct 2008 17:33:44 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DHXiPv081764;
	Mon, 13 Oct 2008 17:33:44 GMT (envelope-from csjp@svn.freebsd.org)
Received: (from csjp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9DHXibj081763;
	Mon, 13 Oct 2008 17:33:44 GMT (envelope-from csjp@svn.freebsd.org)
Message-Id: <200810131733.m9DHXibj081763@svn.freebsd.org>
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Mon, 13 Oct 2008 17:33:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183826 - in stable/7/sys: . netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Oct 2008 17:33:45 -0000

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);