diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-06-03 12:27:06 +0000 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-07-17 16:51:37 +0200 |
| commit | ec44a62d580ca863e13a5f650333a6c778eb8550 (patch) | |
| tree | 29a5ae22e455f3bdc72644ab3a521ca0d3c3697c /drivers/char/.gitignore | |
| parent | ebbfc979681ba61482e9d2a53f10277e56e5462f (diff) | |
| download | kernel_samsung_aries-ec44a62d580ca863e13a5f650333a6c778eb8550.zip kernel_samsung_aries-ec44a62d580ca863e13a5f650333a6c778eb8550.tar.gz kernel_samsung_aries-ec44a62d580ca863e13a5f650333a6c778eb8550.tar.bz2 | |
futex-prevent-requeue-pi-on-same-futex.patch futex: Forbid uaddr == uaddr2 in futex_requeue(..., requeue_pi=1)
commit e9c243a5a6de0be8e584c604d353412584b592f8 upstream.
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>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/.gitignore')
0 files changed, 0 insertions, 0 deletions