Commit 7dd01aef0557 ("arm64: trap userspace "dc cvau" cache operation on
errata-affected core") adds code to execute cache maintenance instructions
in the kernel on behalf of userland on CPUs with certain ARM CPU errata.
It turns out that the address hasn't been checked to be a valid user
space address, allowing userland to clean cache lines in kernel space.
Fix this by introducing an access_ok() check before executing the
instructions on behalf of userland, taking care of tagged pointers on
the way.

Reported-by: Kristina Martsenko <kristina.martse...@arm.com>
Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
Cc: <sta...@vger.kernel.org> # 4.8.x
---
 arch/arm64/include/asm/uaccess.h |  4 ++++
 arch/arm64/kernel/traps.c        | 32 ++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index bcaf6fb..f842b47 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -21,6 +21,7 @@
 /*
  * User space memory access functions
  */
+#include <linux/bitops.h>
 #include <linux/kasan-checks.h>
 #include <linux/string.h>
 #include <linux/thread_info.h>
@@ -103,6 +104,9 @@ static inline void set_fs(mm_segment_t fs)
 })
 
 #define access_ok(type, addr, size)    __range_ok(addr, size)
+#define access_ok_tagged(type, addr, size)  access_ok(type,                   \
+                                                     sign_extend64(addr, 55), \
+                                                     size)
 #define user_addr_max                  get_fs
 
 #define _ASM_EXTABLE(from, to)                                         \
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 5ff020f..04ea0d7 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -447,6 +447,30 @@ void cpu_enable_cache_maint_trap(void *__unused)
                : "=r" (res)                                    \
                : "r" (address), "i" (-EFAULT) )
 
+enum {USER_CACHE_MAINT_DC_CIVAC, USER_CACHE_MAINT_IC_IVAU};
+
+static int do_user_cache_maint(int ins_type, unsigned long address)
+{
+       int ret;
+       unsigned long cl_size = cache_line_size();
+
+       if (!access_ok_tagged(VERIFY_READ,
+                             round_down(address, cl_size),
+                             cl_size))
+               return -EFAULT;
+
+       switch (ins_type) {
+       case USER_CACHE_MAINT_DC_CIVAC:
+               __user_cache_maint("dc civac", address, ret);
+               break;
+       case USER_CACHE_MAINT_IC_IVAU:
+               __user_cache_maint("ic ivau", address, ret);
+               break;
+       }
+
+       return ret;
+}
+
 static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs)
 {
        unsigned long address;
@@ -458,16 +482,16 @@ static void user_cache_maint_handler(unsigned int esr, 
struct pt_regs *regs)
 
        switch (crm) {
        case ESR_ELx_SYS64_ISS_CRM_DC_CVAU:     /* DC CVAU, gets promoted */
-               __user_cache_maint("dc civac", address, ret);
+               ret = do_user_cache_maint(USER_CACHE_MAINT_DC_CIVAC, address);
                break;
        case ESR_ELx_SYS64_ISS_CRM_DC_CVAC:     /* DC CVAC, gets promoted */
-               __user_cache_maint("dc civac", address, ret);
+               ret = do_user_cache_maint(USER_CACHE_MAINT_DC_CIVAC, address);
                break;
        case ESR_ELx_SYS64_ISS_CRM_DC_CIVAC:    /* DC CIVAC */
-               __user_cache_maint("dc civac", address, ret);
+               ret = do_user_cache_maint(USER_CACHE_MAINT_DC_CIVAC, address);
                break;
        case ESR_ELx_SYS64_ISS_CRM_IC_IVAU:     /* IC IVAU */
-               __user_cache_maint("ic ivau", address, ret);
+               ret = do_user_cache_maint(USER_CACHE_MAINT_IC_IVAU, address);
                break;
        default:
                force_signal_inject(SIGILL, ILL_ILLOPC, regs, 0);
-- 
2.9.0

Reply via email to