From owner-p4-projects@FreeBSD.ORG  Fri Jun  5 17:36:20 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7BA3D1065675; Fri,  5 Jun 2009 17:36:20 +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 37372106566C
	for <perforce@freebsd.org>; Fri,  5 Jun 2009 17:36:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 24C998FC14
	for <perforce@freebsd.org>; Fri,  5 Jun 2009 17:36:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55HaJ9T031796
	for <perforce@freebsd.org>; Fri, 5 Jun 2009 17:36:19 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55HaJK9031794
	for perforce@freebsd.org; Fri, 5 Jun 2009 17:36:19 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 5 Jun 2009 17:36:19 GMT
Message-Id: <200906051736.n55HaJK9031794@repoman.freebsd.org>
X-Authentication-Warning: repoman.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>
Cc: 
Subject: PERFORCE change 163589 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: Fri, 05 Jun 2009 17:36:21 -0000

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

Change 163589 by trasz@trasz_victim on 2009/06/05 17:36:05

	In setrlimit(2), the 'max' limit doesn't enforce anything other than
	the 'soft' limit.  No point in putting it into hrl.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#3 edit

Differences ...

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

@@ -646,7 +646,7 @@
 static void
 hrl_handle_setrlimit(u_int which, struct rlimit *lim, struct thread *td)
 {
-	int object, subject, soft_action, hard_action;
+	int object, subject, action = -1;
 	id_t id;
 
 	/*
@@ -654,13 +654,11 @@
 	 */
 	subject = HRL_SUBJECT_PROCESS;
 	id = td->td_proc->p_pid;
-	soft_action = HRL_ACTION_LOG;
-	hard_action = HRL_ACTION_DENY;
 
 	switch (which) {
 	case RLIMIT_CPU:
 		object = HRL_OBJECT_CPUTIME;
-		soft_action = HRL_ACTION_SIGXCPU;
+		action = HRL_ACTION_SIGXCPU;
 		break;
 	case RLIMIT_FSIZE:
 		object = HRL_OBJECT_FILESIZE;
@@ -670,7 +668,7 @@
 		break;
 	case RLIMIT_STACK:
 		object = HRL_OBJECT_STACKSIZE;
-		soft_action = HRL_ACTION_SIGSEGV;
+		action = HRL_ACTION_SIGSEGV;
 		break;
 	case RLIMIT_CORE:
 		object = HRL_OBJECT_COREDUMPSIZE;
@@ -688,7 +686,7 @@
 		break;
 	case RLIMIT_NOFILE:
 		object = HRL_OBJECT_OPENFILES;
-		soft_action = HRL_ACTION_SIGXFSZ;
+		action = HRL_ACTION_SIGXFSZ;
 		break;
 	case RLIMIT_SBSIZE:
 		object = HRL_OBJECT_SBSIZE;
@@ -707,16 +705,17 @@
 		panic("hrl_handle_setrlimit: unknown limit");
 	}
 
-	if (lim->rlim_cur != RLIM_INFINITY)
-		hrl_adjust(subject, id, subject, object, soft_action,
+	if (lim->rlim_cur != RLIM_INFINITY) {
+		hrl_adjust(subject, id, subject, object, HRL_ACTION_DENY,
 		    lim->rlim_cur);
-	else
-		hrl_adjust(subject, id, subject, object, soft_action, 0);
-	if (lim->rlim_max != RLIM_INFINITY)
-		hrl_adjust(subject, id, subject, object, hard_action,
-		    lim->rlim_max);
-	else
-		hrl_adjust(subject, id, subject, object, hard_action, 0);
+		if (action != -1)
+			hrl_adjust(subject, id, subject, object, action,
+			    lim->rlim_cur);
+	} else {
+		hrl_adjust(subject, id, subject, object, HRL_ACTION_DENY, 0);
+		if (action != -1)
+			hrl_adjust(subject, id, subject, object, action, 0);
+	}
 }
 
 int