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

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

microblaze: fix copy_from_user() 



commit d0cf385160c12abd109746cad1f13e3b3e8b50b8 upstream.

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

arch/microblaze/include/asm/uaccess.h

+6 −3
Original line number Diff line number Diff line
@@ -373,10 +373,13 @@ extern long __user_bad(void); 
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);

	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;

}



#define __copy_to_user(to, from, n)	\