From owner-svn-src-head@FreeBSD.ORG  Sat Jun 20 17:42:54 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86BBE106566C;
	Sat, 20 Jun 2009 17:42:54 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 74C268FC19;
	Sat, 20 Jun 2009 17:42:54 +0000 (UTC)
	(envelope-from rwatson@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 n5KHgsCO082501;
	Sat, 20 Jun 2009 17:42:54 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KHgs7H082499;
	Sat, 20 Jun 2009 17:42:54 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906201742.n5KHgs7H082499@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 20 Jun 2009 17:42:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194544 - head/sys/netipx
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2009 17:42:55 -0000

Author: rwatson
Date: Sat Jun 20 17:42:53 2009
New Revision: 194544
URL: http://svn.freebsd.org/changeset/base/194544

Log:
  Invoke the MAC Framework's mac_socket_create_mbuf() entry point when
  generating IPX output for raw and datagram IPX sockets.
  
  Obtained from:	TrustedBSD Project

Modified:
  head/sys/netipx/ipx_usrreq.c

Modified: head/sys/netipx/ipx_usrreq.c
==============================================================================
--- head/sys/netipx/ipx_usrreq.c	Sat Jun 20 17:28:38 2009	(r194543)
+++ head/sys/netipx/ipx_usrreq.c	Sat Jun 20 17:42:53 2009	(r194544)
@@ -90,6 +90,8 @@ __FBSDID("$FreeBSD$");
 #include <netipx/ipx_pcb.h>
 #include <netipx/ipx_var.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * IPX protocol implementation.
  */
@@ -577,6 +579,9 @@ ipx_send(struct socket *so, int flags, s
 	 * used by ipx_pcbconnect() and ipx_pcbdisconnect(), just the IPX
 	 * pcb lock.
 	 */
+#ifdef MAC
+	mac_socket_create_mbuf(so, m);
+#endif
 	if (nam != NULL) {
 		IPX_LIST_LOCK();
 		IPX_LOCK(ipxp);