Commit fff5a5e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:
 "Just one fix for now to eliminate a KASAN false positive"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9290/1: uaccess: Fix KASAN false-positives
parents c13e02d3 ceac10c8

arch/arm/lib/uaccess_with_memcpy.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) 
			tocopy = n;



		ua_flags = uaccess_save_and_enable();

		memcpy((void *)to, from, tocopy);

		__memcpy((void *)to, from, tocopy);

		uaccess_restore(ua_flags);

		to += tocopy;

		from += tocopy;
@@ -178,7 +178,7 @@ __clear_user_memset(void __user *addr, unsigned long n) 
			tocopy = n;



		ua_flags = uaccess_save_and_enable();

		memset((void *)addr, 0, tocopy);

		__memset((void *)addr, 0, tocopy);

		uaccess_restore(ua_flags);

		addr += tocopy;

		n -= tocopy;