From owner-p4-projects@FreeBSD.ORG  Wed Aug 30 21:27:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1723216A576; Wed, 30 Aug 2006 21:27:11 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E980F16A55D
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:27:10 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A160743D53
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:27:10 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ULRANn037944
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 21:27:10 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ULRA7L037940
	for perforce@freebsd.org; Wed, 30 Aug 2006 21:27:10 GMT
	(envelope-from millert@freebsd.org)
Date: Wed, 30 Aug 2006 21:27:10 GMT
Message-Id: <200608302127.k7ULRA7L037940@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105368 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Aug 2006 21:27:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=105368

Change 105368 by millert@millert_g4tower on 2006/08/30 21:27:07

	Add missing xsocket conversion.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#4 (text+ko) ====

@@ -187,12 +187,14 @@
 mac_socket_create_mbuf(struct socket *socket, struct mbuf *mbuf)
 {
 	struct label *label;
+	struct xsocket xso;
 
 	/* socket must be locked */
 
 	label = mac_mbuf_to_label(mbuf);
         
 	/* Policy must deal with NULL label (unlabeled mbufs) */
-	MAC_PERFORM(socket_create_mbuf, socket, socket->so_label,
+	sotoxsocket(socket, &xso);
+	MAC_PERFORM(socket_create_mbuf, &xso, socket->so_label,
 		    mbuf, label);
 }