diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:32:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:32:07 -0400 |
commit | 88f502fedba82eff252b6420e8b8328e4ae25c67 (patch) | |
tree | 5063980d641f077da073ce972028c2b07ccb1bbc | |
parent | f061d35150003b7fd5b133d14d66a74500fdaa60 (diff) |
futex: remove the pointer math from double_unlock_hb, fix
Impact: fix double unlock crash
Thomas Gleixner noticed that the simplified double_unlock_hb()
became ... too unsophisticated: in the hb1 == hb2 case it will
do a double unlock.
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Darren Hart <dvhltc@us.ibm.com>
LKML-Reference: <20090312221118.11146.68610.stgit@Aeon>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/futex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 2331b73f6932..6b50a024bca2 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -659,7 +659,8 @@ static inline void | |||
659 | double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) | 659 | double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) |
660 | { | 660 | { |
661 | spin_unlock(&hb1->lock); | 661 | spin_unlock(&hb1->lock); |
662 | spin_unlock(&hb2->lock); | 662 | if (hb1 != hb2) |
663 | spin_unlock(&hb2->lock); | ||
663 | } | 664 | } |
664 | 665 | ||
665 | /* | 666 | /* |