diff options
Diffstat (limited to 'arch/x86/include/asm/uaccess_64.h')
| -rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 46324c6a4f6e..535e421498f6 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h | |||
| @@ -30,16 +30,15 @@ static inline unsigned long __must_check copy_from_user(void *to, | |||
| 30 | unsigned long n) | 30 | unsigned long n) |
| 31 | { | 31 | { |
| 32 | int sz = __compiletime_object_size(to); | 32 | int sz = __compiletime_object_size(to); |
| 33 | int ret = -EFAULT; | ||
| 34 | 33 | ||
| 35 | might_fault(); | 34 | might_fault(); |
| 36 | if (likely(sz == -1 || sz >= n)) | 35 | if (likely(sz == -1 || sz >= n)) |
| 37 | ret = _copy_from_user(to, from, n); | 36 | n = _copy_from_user(to, from, n); |
| 38 | #ifdef CONFIG_DEBUG_VM | 37 | #ifdef CONFIG_DEBUG_VM |
| 39 | else | 38 | else |
| 40 | WARN(1, "Buffer overflow detected!\n"); | 39 | WARN(1, "Buffer overflow detected!\n"); |
| 41 | #endif | 40 | #endif |
| 42 | return ret; | 41 | return n; |
| 43 | } | 42 | } |
| 44 | 43 | ||
| 45 | static __always_inline __must_check | 44 | static __always_inline __must_check |
