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)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Aug 2018 17:01:24 +0000 (10:01 -0700)
commit66b51b0a0341fd42ce657739bdae0561b0410a85
treefd78fd9cb07be5628896380c282ab7d0e841d7d8
parent1c89a8e3d9a235454169e189ea6c463bfa8749ab
net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()

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>
net/core/sock_diag.c
net/socket.c