ARM: 8797/1: spectre-v1.1: harden __copy_to_user

Sanitize user pointer given to __copy_to_user, both for standard version
and memcopy version of the user accessor.

Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
index 9b4ed1728616..73dc7360cbdd 100644
--- a/arch/arm/lib/uaccess_with_memcpy.c
+++ b/arch/arm/lib/uaccess_with_memcpy.c
@@ -152,7 +152,8 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n)
                 n = __copy_to_user_std(to, from, n);
                 uaccess_restore(ua_flags);
         } else {
-                n = __copy_to_user_memcpy(to, from, n);
+                n = __copy_to_user_memcpy(uaccess_mask_range_ptr(to, n),
+                                          from, n);
         }
         return n;
 }