]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
asm-generic: make copy_from_user() zero the destination properly
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 17 Aug 2016 20:36:37 +0000 (16:36 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 9 Sep 2016 23:34:32 +0000 (19:34 -0400)
... in all cases, including the failing access_ok()

Note that some architectures using asm-generic/uaccess.h have
__copy_from_user() not zeroing the tail on failure halfway
through.  This variant works either way.

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
include/asm-generic/uaccess.h

index 1bfa602958f2a2f7beb16fab8f98263d198c652b..04e21a41796a5926fa198553570583005a334f52 100644 (file)
@@ -257,11 +257,13 @@ extern int __get_user_bad(void) __attribute__((noreturn));
 static inline long copy_from_user(void *to,
                const void __user * from, unsigned long n)
 {
+       unsigned long res = n;
        might_fault();
-       if (access_ok(VERIFY_READ, from, n))
-               return __copy_from_user(to, from, n);
-       else
-               return n;
+       if (likely(access_ok(VERIFY_READ, from, n)))
+               res = __copy_from_user(to, from, n);
+       if (unlikely(res))
+               memset(to + (n - res), 0, res);
+       return res;
 }
 
 static inline long copy_to_user(void __user *to,