From owner-p4-projects@FreeBSD.ORG  Sun Jan 23 15:25:13 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55A89106566C; Sun, 23 Jan 2011 15:25:13 +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 164BC106564A
	for <perforce@freebsd.org>; Sun, 23 Jan 2011 15:25:13 +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 035BF8FC13
	for <perforce@freebsd.org>; Sun, 23 Jan 2011 15:25:13 +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 p0NFPCkI094507
	for <perforce@freebsd.org>; Sun, 23 Jan 2011 15:25:12 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0NFPC3C094504
	for perforce@freebsd.org; Sun, 23 Jan 2011 15:25:12 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 23 Jan 2011 15:25:12 GMT
Message-Id: <201101231525.p0NFPC3C094504@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 188100 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: Sun, 23 Jan 2011 15:25:13 -0000

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

Change 188100 by trasz@trasz_victim on 2011/01/23 15:24:14

	Two "deny" rules that differ only by their "amount" value don't make
	sense.  Prevent it.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#15 edit

Differences ...

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

@@ -897,6 +897,7 @@
 	struct uidinfo *uip;
 	struct prison *pr;
 	struct loginclass *lc;
+	struct rctl_rule *rule2;
 	int match;
 
 	KASSERT(rctl_rule_fully_specified(rule), ("rule not fully specified"));
@@ -905,9 +906,16 @@
 		return (EOPNOTSUPP);
 
 	/*
-	 * Make sure there are no duplicated rules.
+	 * Make sure there are no duplicated rules.  Also, for the "deny"
+	 * rules, remove ones differing only by "amount".
 	 */
-	rctl_rule_remove(rule);
+	if (rule->rr_action == RCTL_ACTION_DENY) {
+		rule2 = rctl_rule_duplicate(rule, M_WAITOK);
+		rule2->rr_amount = RCTL_AMOUNT_UNDEFINED;
+		rctl_rule_remove(rule2);
+		rctl_rule_release(rule2);
+	} else
+		rctl_rule_remove(rule);
 
 	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_PROCESS:
@@ -916,9 +924,7 @@
 		rctl_container_add_rule(&p->p_container, rule);
 		/*
 		 * In case of per-process rule, we don't have anything more
-		 * to do.  Also, there is no point in increasing reference
-		 * count, as the per-process containers never have
-		 * any subcontainers.
+		 * to do.
 		 */
 		return (0);