diff options
| author |   Nick Piggin <npiggin@suse.de> | 2008-09-10 13:37:17 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-09-11 09:44:21 +0200 |
| commit | 3ee1afa308f2a38e5d1e2ad3752ad7abcf480da1 (patch) | |
| tree | 914e0f3bbd32a387cf6095c6955369fa8da7ebf6 /arch/x86/lib/usercopy_64.c | |
| parent | x86: some lock annotations for user copy paths (diff) | |
| download | linux-dev-3ee1afa308f2a38e5d1e2ad3752ad7abcf480da1.tar.xz linux-dev-3ee1afa308f2a38e5d1e2ad3752ad7abcf480da1.zip | |
x86: some lock annotations for user copy paths, v2
- introduce might_fault()
- handle the atomic user copy paths correctly
[ mingo@elte.hu: move might_sleep() outside of in_atomic(). ]
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib/usercopy_64.c')
| -rw-r--r-- | arch/x86/lib/usercopy_64.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 847d12945998..64d6c84e6353 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -15,9 +15,7 @@ #define __do_strncpy_from_user(dst,src,count,res) \ do { \ long __d0, __d1, __d2; \ - might_sleep(); \ - if (current->mm) \ - might_lock_read(¤t->mm->mmap_sem); \ + might_fault(); \ __asm__ __volatile__( \ " testq %1,%1\n" \ " jz 2f\n" \ @@ -66,9 +64,7 @@ EXPORT_SYMBOL(strncpy_from_user); unsigned long __clear_user(void __user *addr, unsigned long size) { long __d0; - might_sleep(); - if (current->mm) - might_lock_read(¤t->mm->mmap_sem); + might_fault(); /* no memory constraint because it doesn't change any memory gcc knows about */ asm volatile( |