]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit
futex-prevent-requeue-pi-on-same-futex.patch
authorGagan Grover <ggrover@nvidia.com>
Thu, 16 Oct 2014 07:25:15 +0000 (12:55 +0530)
committerDhiren Parmar <dparmar@nvidia.com>
Fri, 17 Oct 2014 09:03:23 +0000 (02:03 -0700)
commit4c4ba5713134aad298da786bd9a5fce149b47cce
treee4e2bfebf948f14b185970903075b5a2e96a7397
parenta57c5168a03b31864938499f12402a11072f323e
futex-prevent-requeue-pi-on-same-futex.patch

futex: Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)
If uaddr == uaddr2, then we have broken the rule of only requeueing
froma non-pi futex to a pi futex with this call.  If we attempt this,
then dangling pointers may be left for rt_waiter resulting in an
exploitable condition.

This change brings futex_requeue() in line with
futex_wait_requeue_pi() which performs the same check as per
commit 6f7b0a2a5c0f
("futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()")

[ tglx: Compare the resulting keys as well, as uaddrs might be
   different depending on the mapping ]

Fixes CVE-2014-3153.

Reported-by: Pinkie Pie
Signed-off-by: Will Drewry <wad@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: I47c30a493a2e750ce0a91a8606f602c15f381415
Signed-off-by: Gagan Grover <ggrover@nvidia.com>
Reviewed-on: http://git-master/r/558301
Reviewed-by: Prafull Suryawanshi <prafulls@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Gaurav Singh <gauravsingh@nvidia.com>
kernel/futex.c