futex: Take mmap_sem for get_user_pages in fault_in_user_writeable
authorAndi Kleen <andi@firstfloor.org>
Tue, 8 Dec 2009 12:19:42 +0000 (13:19 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 8 Dec 2009 13:59:36 +0000 (14:59 +0100)
get_user_pages() must be called with mmap_sem held.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: stable@kernel.org
Cc: Andrew Morton <akpm@linuxfoundation.org>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Darren Hart <dvhltc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20091208121942.GA21298@basil.fritz.box>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/futex.c

index fb65e822fc41ae698c282aeadc6933b411aa8a78..d73ef1f3e55db35748c444701ff856219612b93b 100644 (file)
@@ -304,8 +304,14 @@ void put_futex_key(int fshared, union futex_key *key)
  */
 static int fault_in_user_writeable(u32 __user *uaddr)
 {
-       int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,
-                                1, 1, 0, NULL, NULL);
+       struct mm_struct *mm = current->mm;
+       int ret;
+
+       down_read(&mm->mmap_sem);
+       ret = get_user_pages(current, mm, (unsigned long)uaddr,
+                            1, 1, 0, NULL, NULL);
+       up_read(&mm->mmap_sem);
+
        return ret < 0 ? ret : 0;
 }