diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 17:21:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 17:21:27 -0700 |
| commit | bd28b14591b98f696bc9f94c5ba2e598ca487dfd (patch) | |
| tree | 5cd165412fa7dec2dbbac28ff6d8d5b12d3011f4 /kernel/events | |
| parent | 5b09c3edecd37ec1a52fbd5ae97a19734edc7a77 (diff) | |
| download | linux-stable-bd28b14591b98f696bc9f94c5ba2e598ca487dfd.tar.gz linux-stable-bd28b14591b98f696bc9f94c5ba2e598ca487dfd.tar.bz2 linux-stable-bd28b14591b98f696bc9f94c5ba2e598ca487dfd.zip | |
x86: remove more uaccess_32.h complexity
I'm looking at trying to possibly merge the 32-bit and 64-bit versions
of the x86 uaccess.h implementation, but first this needs to be cleaned
up.
For example, the 32-bit version of "__copy_from_user_inatomic()" is
mostly the special cases for the constant size, and it's actually almost
never relevant. Most users aren't actually using a constant size
anyway, and the few cases that do small constant copies are better off
just using __get_user() instead.
So get rid of the unnecessary complexity.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/uprobes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 7edc95edfaee..c01f733ff2e1 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1694,8 +1694,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) int result; pagefault_disable(); - result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr, - sizeof(opcode)); + result = __get_user(opcode, (uprobe_opcode_t __user *)vaddr); pagefault_enable(); if (likely(result == 0)) |