powerpc/ptrace: Mitigate potential Spectre v1

'regno' is directly controlled by user space, hence leading to a potential
exploitation of the Spectre variant 1 vulnerability.

On PTRACE_SETREGS and PTRACE_GETREGS requests, user space passes the
register number that would be read or written. This register number is
called 'regno' which is part of the 'addr' syscall parameter.

This 'regno' value is checked against the maximum pt_regs structure size,
and then used to dereference it, which matches the initial part of a
Spectre v1 (and Spectre v1.1) attack. The dereferenced value, then,
is returned to userspace in the GETREGS case.

This patch sanitizes 'regno' before using it to dereference pt_reg.

Notice that given that speculation windows are large, the policy is
to kill the speculation on the first load and not worry if it can be
completed with a dependent load/store [1].

[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2

Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
CVE-2017-5753

(backported from commit ebb0e13ead2ddc186a80b1b0235deeefc5a1a667)
[juergh: Adjusted context.]
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 81750d9624abbd14164e2a740e43b4b7ea393b9f..716efd4bdc6b29de93ed2bff61544d65f3d1a7d0 100644 (file)
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -33,6 +33,7 @@
 #include <linux/hw_breakpoint.h>
 #include <linux/perf_event.h>
 #include <linux/context_tracking.h>
+#include <linux/nospec.h>
 
 #include <linux/uaccess.h>
 #include <asm/page.h>
@@ -272,6 +273,8 @@ static int set_user_trap(struct task_struct *task, unsigned long trap)
  */
 int ptrace_get_reg(struct task_struct *task, int regno, unsigned long *data)
 {
+       unsigned int regs_max;
+
        if ((task->thread.regs == NULL) || !data)
                return -EIO;
 
@@ -283,7 +286,9 @@ int ptrace_get_reg(struct task_struct *task, int regno, unsigned long *data)
        if (regno == PT_DSCR)
                return get_user_dscr(task, data);
 
-       if (regno < (sizeof(struct pt_regs) / sizeof(unsigned long))) {
+       regs_max = sizeof(struct pt_regs) / sizeof(unsigned long);
+       if (regno < regs_max) {
+               regno = array_index_nospec(regno, regs_max);
                *data = ((unsigned long *)task->thread.regs)[regno];
                return 0;
        }
@@ -307,6 +312,7 @@ int ptrace_put_reg(struct task_struct *task, int regno, unsigned long data)
                return set_user_dscr(task, data);
 
        if (regno <= PT_MAX_PUT_REG) {
+               regno = array_index_nospec(regno, PT_MAX_PUT_REG + 1);
                ((unsigned long *)task->thread.regs)[regno] = data;
                return 0;
        }