From owner-p4-projects@FreeBSD.ORG  Thu May 31 14:28:28 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 D336516A46E; Thu, 31 May 2007 14:28:27 +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 A677A16A400
	for <perforce@freebsd.org>; Thu, 31 May 2007 14:28:27 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 98ADC13C458
	for <perforce@freebsd.org>; Thu, 31 May 2007 14:28:27 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VESRYn023177
	for <perforce@freebsd.org>; Thu, 31 May 2007 14:28:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VESRHs023168
	for perforce@freebsd.org; Thu, 31 May 2007 14:28:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 31 May 2007 14:28:27 GMT
Message-Id: <200705311428.l4VESRHs023168@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120665 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: Thu, 31 May 2007 14:28:28 -0000

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

Change 120665 by rwatson@rwatson_zoo on 2007/05/31 14:27:52

	Remove more SUSER_ALLOWJAIL; annotate missing cred->socket check
	in UDPv6.

Affected files ...

.. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#8 edit
.. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#8 (text+ko) ====

@@ -438,13 +438,7 @@
 
 	vrf_id = SCTP_DEFAULT_VRFID;
 
-	/*
-	 * XXXRW: Other instances of getcred use SUSER_ALLOWJAIL, as socket
-	 * visibility is scoped using cr_canseesocket(), which it is not
-	 * here.
-	 */
-	error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_RESERVEDPORT,
-	    0);
+	error = priv_check(req->td, PRIV_NETINET_GETCRED);
 	if (error)
 		return (error);
 

==== //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#8 (text+ko) ====

@@ -437,8 +437,7 @@
 	struct inpcb *inp;
 	int error;
 
-	error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED,
-	    SUSER_ALLOWJAIL);
+	error = priv_check(req->td, PRIV_NETINET_GETCRED);
 	if (error)
 		return (error);
 
@@ -465,6 +464,9 @@
 	INP_LOCK(inp);
 	KASSERT(inp->inp_socket != NULL,
 	    ("udp6_getcred: inp_socket == NULL"));
+	/*
+	 * XXXRW: There should be a scoping access control check here.
+	 */
 	cru2x(inp->inp_socket->so_cred, &xuc);
 	INP_UNLOCK(inp);
 	INP_INFO_RUNLOCK(&udbinfo);