diff options
| author | Jeremy Cline <jcline@redhat.com> | 2018-07-27 22:43:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-28 22:43:30 -0700 |
| commit | c8e8cd579bb4265651df8223730105341e61a2d1 (patch) | |
| tree | a2d787f02fe5e97e3f49b002ca26aea04d8815e8 | |
| parent | 958b4cd8fa4c2eff0c257b07f2bb753b7c7a6f52 (diff) | |
| download | lwn-c8e8cd579bb4265651df8223730105341e61a2d1.tar.gz lwn-c8e8cd579bb4265651df8223730105341e61a2d1.zip | |
net: socket: fix potential spectre v1 gadget in socketcall
'call' is a user-controlled value, so sanitize the array index after the
bounds check to avoid speculating past the bounds of the 'nargs' array.
Found with the help of Smatch:
net/socket.c:2508 __do_sys_socketcall() warn: potential spectre issue
'nargs' [r] (local cap)
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeremy Cline <jcline@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 85633622c94d..4ac3b834cce9 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)) |