Commit-ID: e182bb38d7db7494fa5dcd82da17fe0dedf60ecf
Gitweb: http://git.kernel.org/tip/e182bb38d7db7494fa5dcd82da17fe0dedf60ecf
Author: Tejun Heo <t...@kernel.org>
AuthorDate: Wed, 20 Feb 2013 15:24:12 -0800
Committer: Thomas Gleixner <t...@linutronix.de>
CommitDate: Thu, 21 Feb 2013 17:28:29 +0100
posix-timer: Don't call idr_find() with out-of-range ID
When idr_find() was fed a negative ID, it used to look up the ID
ignoring the sign bit before recent ("idr: remove MAX_IDR_MASK and
move left MAX_IDR_* into idr.c") patch. Now a negative ID triggers
a WARN_ON_ONCE().
__lock_timer() feeds timer_id from userland directly to idr_find()
without sanitizing it which can trigger the above malfunctions. Add a
range check on @timer_id before invoking idr_find() in __lock_timer().
While timer_t is defined as int by all archs at the moment, Andrew
worries that it may be defined as a larger type later on. Make the
test cover larger integers too so that it at least is guaranteed to
not return the wrong timer.
Note that WARN_ON_ONCE() in idr_find() on id < 0 is transitional
precaution while moving away from ignoring MSB. Once it's gone we can
remove the guard as long as timer_t isn't larger than int.
Signed-off-by: Tejun Heo <t...@kernel.org>nnn
Reported-by: Sasha Levin <sasha.le...@oracle.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: sta...@vger.kernel.org
Link: http://lkml.kernel.org/r/20130220232412.gl3...@htj.dyndns.org
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
kernel/posix-timers.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 10349d5..7edfe4b 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -639,6 +639,13 @@ static struct k_itimer *__lock_timer(timer_t timer_id,
unsigned long *flags)
{
struct k_itimer *timr;
+ /*
+ * timer_t could be any type >= int and we want to make sure any
+ * @timer_id outside positive int range fails lookup.
+ */
+ if ((unsigned long long)timer_id > INT_MAX)
+ return NULL;
+
rcu_read_lock();
timr = idr_find(&posix_timers_id, (int)timer_id);
if (timr) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
