diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 10:45:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 10:45:03 -0800 |
| commit | 10436cf8812edadcc1813dbda39a69e9965caee6 (patch) | |
| tree | 5659ab914ddda91fac03556cc8d38f13fe87e185 /kernel | |
| parent | 5fbe4c224ce3e2e62bd487158dfd1e89f9ae3e11 (diff) | |
| parent | d6abfdb2022368d8c6c4be3f11a06656601a6cc2 (diff) | |
| download | linux-10436cf8812edadcc1813dbda39a69e9965caee6.tar.gz linux-10436cf8812edadcc1813dbda39a69e9965caee6.tar.bz2 linux-10436cf8812edadcc1813dbda39a69e9965caee6.zip | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Two fixes: the paravirt spin_unlock() corruption/crash fix, and an
rtmutex NULL dereference crash fix"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/spinlocks/paravirt: Fix memory corruption on unlock
locking/rtmutex: Avoid a NULL pointer dereference on deadlock
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/locking/rtmutex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 3059bc2f022d..e16e5542bf13 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1193,7 +1193,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, ret = __rt_mutex_slowlock(lock, state, timeout, &waiter); if (unlikely(ret)) { - remove_waiter(lock, &waiter); + if (rt_mutex_has_waiters(lock)) + remove_waiter(lock, &waiter); rt_mutex_handle_deadlock(ret, chwalk, &waiter); } |