From owner-svn-src-head@FreeBSD.ORG  Fri Dec 17 16:29:07 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 168E7106566C;
	Fri, 17 Dec 2010 16:29:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04D9B8FC0A;
	Fri, 17 Dec 2010 16:29:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBHGT62w087789;
	Fri, 17 Dec 2010 16:29:06 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBHGT614087787;
	Fri, 17 Dec 2010 16:29:06 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201012171629.oBHGT614087787@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 17 Dec 2010 16:29:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216504 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Dec 2010 16:29:07 -0000

Author: jhb
Date: Fri Dec 17 16:29:06 2010
New Revision: 216504
URL: http://svn.freebsd.org/changeset/base/216504

Log:
  Add back a bounds check on valid idle priorities that was lost in an
  earlier commit.  While here, move the thread lock down in rtp_to_pri().
  It is not needed for all of the priority value checks and the computation
  of newpri.
  
  Reported by:	swell.k @ gmail
  MFC after:	3 days

Modified:
  head/sys/kern/kern_resource.c

Modified: head/sys/kern/kern_resource.c
==============================================================================
--- head/sys/kern/kern_resource.c	Fri Dec 17 16:21:30 2010	(r216503)
+++ head/sys/kern/kern_resource.c	Fri Dec 17 16:29:06 2010	(r216504)
@@ -462,29 +462,27 @@ rtp_to_pri(struct rtprio *rtp, struct th
 	u_char	newpri;
 	u_char	oldpri;
 
-	thread_lock(td);
 	switch (RTP_PRIO_BASE(rtp->type)) {
 	case RTP_PRIO_REALTIME:
-		if (rtp->prio > RTP_PRIO_MAX) {
-			thread_unlock(td);
+		if (rtp->prio > RTP_PRIO_MAX)
 			return (EINVAL);
-		}
 		newpri = PRI_MIN_REALTIME + rtp->prio;
 		break;
 	case RTP_PRIO_NORMAL:
-		if (rtp->prio >  (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE)) {
-			thread_unlock(td);
+		if (rtp->prio > (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE))
 			return (EINVAL);
-		}
 		newpri = PRI_MIN_TIMESHARE + rtp->prio;
 		break;
 	case RTP_PRIO_IDLE:
+		if (rtp->prio > RTP_PRIO_MAX)
+			return (EINVAL);
 		newpri = PRI_MIN_IDLE + rtp->prio;
 		break;
 	default:
-		thread_unlock(td);
 		return (EINVAL);
 	}
+
+	thread_lock(td);
 	sched_class(td, rtp->type);	/* XXX fix */
 	oldpri = td->td_user_pri;
 	sched_user_prio(td, newpri);