From owner-p4-projects@FreeBSD.ORG  Wed Aug 25 21:49:06 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0862C10656AD; Wed, 25 Aug 2010 21:49:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BEC3310656AB
	for <perforce@freebsd.org>; Wed, 25 Aug 2010 21:49:05 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AC2AA8FC15
	for <perforce@freebsd.org>; Wed, 25 Aug 2010 21:49:05 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7PLn5wx051660
	for <perforce@freebsd.org>; Wed, 25 Aug 2010 21:49:05 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7PLn5qm051657
	for perforce@freebsd.org; Wed, 25 Aug 2010 21:49:05 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 25 Aug 2010 21:49:05 GMT
Message-Id: <201008252149.o7PLn5qm051657@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182912 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 25 Aug 2010 21:49:06 -0000

http://p4web.freebsd.org/@@182912?ac=10

Change 182912 by trasz@trasz_victim on 2010/08/25 21:48:51

	There is a problem with change_ruid() - it updates process counts
	(calls chgproccnt()), which doesn't make sense in cases where it operates
	on credentials not assigned to the process.  There is exactly one such
	situation in the tree - in the unionfs code.  Since we already need
	change_cred() routine, we can fix the problem moving messing with
	chgproccnt() from change_ruid() into change_cred().

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#28 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#28 (text+ko) ====

@@ -2126,6 +2126,11 @@
 {
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 
+	if (p->p_ucred->cr_ruidinfo != newcred->cr_ruidinfo) {
+		chgproccnt(p->p_ucred->cr_ruidinfo, -1, 0);
+		chgproccnt(newcred->cr_ruidinfo, 1, 0);
+	}
+
 #ifdef HRL
 	hrl_proc_ucred_changing(p, newcred);
 #endif
@@ -2173,12 +2178,10 @@
 change_ruid(struct ucred *newcred, struct uidinfo *ruip)
 {
 
-	(void)chgproccnt(newcred->cr_ruidinfo, -1, 0);
 	newcred->cr_ruid = ruip->ui_uid;
 	uihold(ruip);
 	uifree(newcred->cr_ruidinfo);
 	newcred->cr_ruidinfo = ruip;
-	(void)chgproccnt(newcred->cr_ruidinfo, 1, 0);
 }
 
 /*-