Commit f3c99447 authored by Dan Williams's avatar Dan Williams Committed by Stefan Bader

x86/syscall: Sanitize syscall table de-references under speculation

BugLink: https://bugs.launchpad.net/bugs/1774181

(cherry picked from commit 2fbd7af5)

The syscall table base is a user controlled function pointer in kernel
space. Use array_index_nospec() to prevent any out of bounds speculation.

While retpoline prevents speculating into a userspace directed target it
does not stop the pointer de-reference, the concern is leaking memory
relative to the syscall table base, by observing instruction cache
behavior.
Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: kernel-hardening@lists.openwall.com
Cc: gregkh@linuxfoundation.org
Cc: Andy Lutomirski <luto@kernel.org>
Cc: alan@linux.intel.com
Link: https://lkml.kernel.org/r/151727417984.33451.1216731042505722161.stgit@dwillia2-desk3.amr.corp.intel.comSigned-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
[jwang: port to 4.4, no syscall_64]
Signed-off-by: default avatarJack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c8961332 linux-4.4.y)
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 5c9420a1
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/context_tracking.h> #include <linux/context_tracking.h>
#include <linux/user-return-notifier.h> #include <linux/user-return-notifier.h>
#include <linux/nospec.h>
#include <linux/uprobes.h> #include <linux/uprobes.h>
#include <asm/desc.h> #include <asm/desc.h>
...@@ -382,6 +383,7 @@ __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs) ...@@ -382,6 +383,7 @@ __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)
} }
if (likely(nr < IA32_NR_syscalls)) { if (likely(nr < IA32_NR_syscalls)) {
nr = array_index_nospec(nr, IA32_NR_syscalls);
/* /*
* It's possible that a 32-bit syscall implementation * It's possible that a 32-bit syscall implementation
* takes a 64-bit parameter but nonetheless assumes that * takes a 64-bit parameter but nonetheless assumes that
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment