diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2018-08-06 20:56:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-06 20:56:34 +0200 |
| commit | 315706049c343794ad0d3e5b6f6b60b900457b11 (patch) | |
| tree | 0a1596a4b5843a6262d17b4c656715854784977d /net/socket.c | |
| parent | x86/speculation: Support Enhanced IBRS on future CPUs (diff) | |
| parent | x86/mm/init: Remove freed kernel image areas from alias mapping (diff) | |
| download | linux-rng-315706049c343794ad0d3e5b6f6b60b900457b11.tar.xz linux-rng-315706049c343794ad0d3e5b6f6b60b900457b11.zip | |
Merge branch 'x86/pti-urgent' into x86/pti
Integrate the PTI Global bit fixes which conflict with the 32bit PTI
support.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 85633622c94d..8c24d5dc4bc8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -89,6 +89,7 @@ #include <linux/magic.h> #include <linux/slab.h> #include <linux/xattr.h> +#include <linux/nospec.h> #include <linux/uaccess.h> #include <asm/unistd.h> @@ -2522,6 +2523,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) if (call < 1 || call > SYS_SENDMMSG) return -EINVAL; + call = array_index_nospec(call, SYS_SENDMMSG + 1); len = nargs[call]; if (len > sizeof(a)) @@ -2688,7 +2690,8 @@ EXPORT_SYMBOL(sock_unregister); bool sock_is_registered(int family) { - return family < NPROTO && rcu_access_pointer(net_families[family]); + return family < NPROTO && + rcu_access_pointer(net_families[array_index_nospec(family, NPROTO)]); } static int __init sock_init(void) |