From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 22:30:24 2007
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 014B616A4C9; Sun, 21 Jan 2007 22:30:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C15DE16A408
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:30:23 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B0C8213C44B
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:30:23 +0000 (UTC)
	(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 l0LMUN9O060780
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:30:23 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMUNPB060775
	for perforce@freebsd.org; Sun, 21 Jan 2007 22:30:23 GMT
	(envelope-from millert@freebsd.org)
Date: Sun, 21 Jan 2007 22:30:23 GMT
Message-Id: <200701212230.l0LMUNPB060775@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 113275 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: Sun, 21 Jan 2007 22:30:24 -0000

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

Change 113275 by millert@millert_macbook on 2007/01/21 22:30:09

	Use existing cred passed in to socket read/write functions
	instead of looking up the cred via curren_proc().  Also
	replace a proc_ucred(current_proc()) with kauth_cred_get().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#5 (text+ko) ====

@@ -112,7 +112,7 @@
 soo_read(
 	struct fileproc *fp,
 	struct uio *uio,
-	__unused kauth_cred_t cred,
+	kauth_cred_t cred,
 	__unused int flags,
 	__unused struct proc *p)
 {
@@ -134,7 +134,7 @@
         }
 #ifdef MAC_SOCKET
 	SOCK_LOCK(so);
-	error = mac_socket_check_receive(proc_ucred(p), so);
+	error = mac_socket_check_receive(cred, so);
 	SOCK_UNLOCK(so);
 	if (error)
 		return (error);
@@ -151,7 +151,7 @@
 soo_write(
 	struct fileproc *fp,
 	struct uio *uio,
-	__unused kauth_cred_t cred,
+	kauth_cred_t cred,
 	__unused int flags,
 	struct proc *procp)
 {
@@ -171,7 +171,7 @@
 
 #ifdef MAC_SOCKET
 	SOCK_LOCK(so);
-	error = mac_socket_check_send(proc_ucred(procp), so);
+	error = mac_socket_check_send(cred, so);
 	SOCK_UNLOCK(so);
 	if (error)
 		return (error);
@@ -419,7 +419,7 @@
 
 #ifdef MAC_SOCKET
 	SOCK_LOCK(so);
-	stat = mac_socket_check_stat(proc_ucred(current_proc()), so);
+	stat = mac_socket_check_stat(kauth_cred_get(), so);
 	SOCK_UNLOCK(so);
 	if (stat)
 		return (stat);