Skip to contentSkip to conversation

futex: Take mmap_sem for get_user_pages in fault_in_user_writeable

PATCH In review Andi Kleen 2 participants 3 messages Dec 8, 2009

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 futex: Take mmap_sem for get_user_pages in fault_in_user_writeable

futex: Take mmap_sem for get_user_pages in fault_in_user_writeable

gup() requires mmap_sem, so take it before running it. The recent fault_in_user_writeable() didn't do that.

I didn't find a good futex test case, so untested.

Likely a stable candidate.

---
 kernel/futex.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/futex.c +6 -1
Index: linux-2.6.32-ak/kernel/futex.c
===================================================================
@@ -304,8 +304,13 @@ void put_futex_key(int fshared, union fu
  */
 static int fault_in_user_writeable(u32 __user *uaddr)
 {
-	int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,
+	int ret;
+	struct mm_struct *mm = current->mm;
+
+	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;
 }
 
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Andi Kleen

futex: Take mmap_sem for get_user_pages in fault_in_user_writeable

gup() requires mmap_sem, so take it before running it. The recent fault_in_user_writeable() didn't do that.

Quoted 8 lines

I didn't find a good futex test case, so untested.

Likely a stable candidate.

I agree it should go to .stable.

Quoted 23 lines
---
 kernel/futex.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: linux-2.6.32-ak/kernel/futex.c
===================================================================

kernel/futex.c +6 -1
@@ -304,8 +304,13 @@ void put_futex_key(int fshared, union fu
  */
 static int fault_in_user_writeable(u32 __user *uaddr)
 {
-	int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,
+	int ret;
+	struct mm_struct *mm = current->mm;
+
+	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;
 }
 
#2 lore raw
In reply to Andi Kleen
Commit-ID:  722d0172377a5697919b9f7e5beb95165b1dec4e
Gitweb:     http://git.kernel.org/tip/722d0172377a5697919b9f7e5beb95165b1dec4e
Author:     Andi Kleen <[email protected]>
AuthorDate: Tue, 8 Dec 2009 13:19:42 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Tue, 8 Dec 2009 14:59:36 +0100

futex: Take mmap_sem for get_user_pages in fault_in_user_writeable

get_user_pages() must be called with mmap_sem held.

Cc Andrew Morton <[email protected]>
Cc Nick Piggin <[email protected]>
Cc Darren Hart <[email protected]>
Cc Peter Zijlstra <[email protected]>

LKML-Reference: <[email protected]>

---
 kernel/futex.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
kernel/futex.c +8 -2
index fb65e82..d73ef1f 100644
@@ -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;
 }