Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5bfcba authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

nios2: copy_from_user() should zero the tail of destination 



commit e33d1f6f72cc82fcfc3d1fb20c9e3ad83b1928fa upstream.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40c38ca6

arch/nios2/include/asm/uaccess.h

+6 −3
Original line number Diff line number Diff line
@@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *to, const void *from, unsigned long n); 
static inline long copy_from_user(void *to, const void __user *from,

				unsigned long n)

{

	if (!access_ok(VERIFY_READ, from, n))

		return n;

	return __copy_from_user(to, from, n);

	unsigned long res = n;

	if (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, const void *from,