diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:48:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:48:21 -0800 |
| commit | 1e57c2186fc204ecd5e47f279d00eba3c3db245c (patch) | |
| tree | aad97e94afe668b2fe734ef28536627ec00860d8 /kernel/futex.c | |
| parent | 756300983f11a1c6f9457d6d8f57354e0f0fe8d4 (diff) | |
| parent | ea5b41f9d595be354f7a50e56b28c2d72e6e88a5 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: Avoid out of bounds array reference in save_trace()
futex: Take mmap_sem for get_user_pages in fault_in_user_writeable
lockstat: Add usage info to Documentation/lockstat.txt
lockstat: Fix min, max times in /proc/lock_stats
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index fb65e822fc4..d73ef1f3e55 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -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; } |