diff options
| author | jhb <jhb@FreeBSD.org> | 2010-12-17 16:29:06 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-12-17 16:29:06 +0000 |
| commit | 1b88c874083589a9b9de4a78a18bb8586b69f3d8 (patch) | |
| tree | cd8e6c548334a3ab9263fdc18a7971d307778a99 /sys/kern | |
| parent | 0193657b55ee30944be9a334c208f917a181a910 (diff) | |
| download | FreeBSD-src-1b88c874083589a9b9de4a78a18bb8586b69f3d8.zip FreeBSD-src-1b88c874083589a9b9de4a78a18bb8586b69f3d8.tar.gz | |
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
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_resource.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 0da0075..ec6b9cc 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -462,29 +462,27 @@ rtp_to_pri(struct rtprio *rtp, struct thread *td) 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); |
