diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-14 08:35:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-14 08:35:08 -0700 |
| commit | 2d6cc4c81b1cb69379102c57a9a927c9583ccb8b (patch) | |
| tree | b90d9b7048091bcc0d63096f6b7595e14e54d5e4 /net/socket.c | |
| parent | 601ae48764031462cfd3b2f62b2d712a3447978b (diff) | |
| parent | b2c952f9a899b7ec78c417951a950f08c5aa9e3a (diff) | |
Merge "Merge android-4.4.146 (13962260) into msm-4.4"
Diffstat (limited to 'net/socket.c')
| -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 00a275ee227a..9f29a9ce6a92 100644 --- a/net/socket.c +++ b/net/socket.c @@ -91,6 +91,7 @@ #include <linux/xattr.h> #include <linux/seemp_api.h> #include <linux/seemp_instrumentation.h> +#include <linux/nospec.h> #include <asm/uaccess.h> #include <asm/unistd.h> @@ -2384,6 +2385,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)) |