]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit
futex : Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)
authorThomas Gleixner <tglx@linutronix.de>
Tue, 3 Jun 2014 12:27:06 +0000 (12:27 +0000)
committerSimone Willett <swillett@nvidia.com>
Fri, 20 Jun 2014 23:28:29 +0000 (16:28 -0700)
commit1c6524e8a8336f5096f49f04c1d54a358aacef02
tree832fb7d662084f31c2cdf9d5f9169fda6ce0804f
parent94fd317bb047d52f247071e648b591eb8c51489b
futex : Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)
Bug 200012742

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 from
a 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: I98b5f95d3f5c9e4d35c3aeec22960fdb34731c18
Reviewed-on: http://git-master/r/424612
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
kernel/futex.c