diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-06-03 12:27:06 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:29:16 +0100 |
| commit | cb730752b9d3ecfb2863784f14c2c997e4a90114 (patch) | |
| tree | a7563720b5364dbd39873f0fe5f41e1c378b6929 /kernel/futex.c | |
| parent | 6105a0f8316ca3ae774881c83623f1bc1822460a (diff) | |
| download | kernel_samsung_smdk4412-cb730752b9d3ecfb2863784f14c2c997e4a90114.zip kernel_samsung_smdk4412-cb730752b9d3ecfb2863784f14c2c997e4a90114.tar.gz kernel_samsung_smdk4412-cb730752b9d3ecfb2863784f14c2c997e4a90114.tar.bz2 | |
futex: Validate atomic acquisition in futex_lock_pi_atomic()
commit b3eaa9fc5cd0a4d74b18f6b8dc617aeaf1873270 upstream.
We need to protect the atomic acquisition in the kernel against rogue
user space which sets the user space futex to 0, so the kernel side
acquisition succeeds while there is existing state in the kernel
associated to the real owner.
Verify whether the futex has waiters associated with kernel state. If
it has, return -EINVAL. The state is corrupted already, so no point in
cleaning it up. Subsequent calls will fail as well. Not our problem.
[ tglx: Use futex_top_waiter() and explain why we do not need to try
restoring the already corrupted user space state. ]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Will Drewry <wad@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index d096c6e..5e61655 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -758,10 +758,18 @@ retry: return -EDEADLK; /* - * Surprise - we got the lock. Just return to userspace: + * Surprise - we got the lock, but we do not trust user space at all. */ - if (unlikely(!curval)) - return 1; + if (unlikely(!curval)) { + /* + * We verify whether there is kernel state for this + * futex. If not, we can safely assume, that the 0 -> + * TID transition is correct. If state exists, we do + * not bother to fixup the user space state as it was + * corrupted already. + */ + return futex_top_waiter(hb, key) ? -EINVAL : 1; + } uval = curval; |