diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-09 19:16:58 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-02 21:14:52 -0400 |
| commit | 59dd93edeca4a00fa749be62ac169123fad61fc6 (patch) | |
| tree | 5fbd8d6d95851a0256a0910a19a8de9c004e3db0 /arch/blackfin/include | |
| parent | 09d5ea250b975f9aa7678ad9f95247173ad30778 (diff) | |
blackfin: fix copy_from_user()
[ Upstream commit 8f035983dd826d7e04f67b28acf8e2f08c347e41 ]
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/uaccess.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h index 90612a7f2cf3..8cd0184ea9ef 100644 --- a/arch/blackfin/include/asm/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h @@ -177,11 +177,12 @@ static inline int bad_user_access_length(void) static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { - if (access_ok(VERIFY_READ, from, n)) + if (likely(access_ok(VERIFY_READ, from, n))) { memcpy(to, (const void __force *)from, n); - else - return n; - return 0; + return 0; + } + memset(to, 0, n); + return n; } static inline unsigned long __must_check |