From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Cline Subject: [PATCH 1/2] net: socket: fix potential spectre v1 gadget in socketcall Date: Fri, 27 Jul 2018 22:43:01 +0000 Message-ID: <20180727224302.5503-2-jcline@redhat.com> References: <20180727224302.5503-1-jcline@redhat.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Josh Poimboeuf , Jeremy Cline , stable@vger.kernel.org To: "David S . Miller" Return-path: In-Reply-To: <20180727224302.5503-1-jcline@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org '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 Cc: stable@vger.kernel.org Signed-off-by: Jeremy Cline --- net/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/socket.c b/net/socket.c index 3015ddace71e..f15d5cbb3ba4 100644 --- a/net/socket.c +++ b/net/socket.c @@ -89,6 +89,7 @@ #include #include #include +#include #include #include @@ -2504,6 +2505,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)) -- 2.17.1