aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-02-20 15:24:12 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-04 06:09:03 +0800
commitffe56d754e59cdb086b76b95fe0c3a0302ec46c8 (patch)
tree9e19b4a91603b975cc7662dbbc46457ab26219b3 /kernel/trace
parentffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c (diff)
downloadkernel_samsung_smdk4412-ffe56d754e59cdb086b76b95fe0c3a0302ec46c8.zip
kernel_samsung_smdk4412-ffe56d754e59cdb086b76b95fe0c3a0302ec46c8.tar.gz
kernel_samsung_smdk4412-ffe56d754e59cdb086b76b95fe0c3a0302ec46c8.tar.bz2
posix-timer: Don't call idr_find() with out-of-range ID
commit e182bb38d7db7494fa5dcd82da17fe0dedf60ecf upstream. 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 <tj@kernel.org> Reported-by: Sasha Levin <sasha.levin@oracle.com> Cc: Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/r/20130220232412.GL3570@htj.dyndns.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions