Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm…

…/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futexes: Fix infinite loop in get_futex_key() on huge page
git-mirror · Jul 15, 2009 · 989fa94 · 989fa94
2 parents c0c50b5 + ce2ae53
commit 989fa94
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/kernel/futex.c b/kernel/futex.c
@@ -247,6 +247,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
 	if (err < 0)
 		return err;
 
+	page = compound_head(page);
 	lock_page(page);
 	if (!page->mapping) {
 		unlock_page(page);