]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()
authorJeremy Cline <jcline@redhat.com>
Mon, 13 Aug 2018 22:23:13 +0000 (22:23 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Aug 2018 05:44:55 +0000 (07:44 +0200)
commitaa89bd0eba99867a5578c3c46b4ed5c07085d7cd
treed2a9916ac4efd79d0a68504bc138c47caddca6f6
parent445bff409b8170b1abb06d4932840a7c708292a1
net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()

[ Upstream commit 66b51b0a0341fd42ce657739bdae0561b0410a85 ]

req->sdiag_family is a user-controlled value that's used as an array
index. Sanitize it after the bounds check to avoid speculative
out-of-bounds array access.

This also protects the sock_is_registered() call, so this removes the
sanitize call there.

Fixes: e978de7a6d38 ("net: socket: Fix potential spectre v1 gadget in sock_is_registered")
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: konrad.wilk@oracle.com
Cc: jamie.iles@oracle.com
Cc: liran.alon@oracle.com
Cc: stable@vger.kernel.org
Signed-off-by: Jeremy Cline <jcline@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/sock_diag.c
net/socket.c