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

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

mn10300: copy_from_user() should zero on access_ok() failure... 



commit ae7cc577ec2a4a6151c9e928fd1f595d953ecef1 upstream.

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

arch/mn10300/lib/usercopy.c

+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */

#include <asm/uaccess.h>

#include <linux/uaccess.h>



unsigned long

__generic_copy_to_user(void *to, const void *from, unsigned long n)
@@ -24,6 +24,8 @@ __generic_copy_from_user(void *to, const void *from, unsigned long n) 
{

	if (access_ok(VERIFY_READ, from, n))

		__copy_user_zeroing(to, from, n);

	else

		memset(to, 0, n);

	return n;

}