bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()

Browse source 
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: e978de7a6d ("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>
This commit is contained in:
Jeremy Cline 2018-08-13 22:23:13 +00:00 • committed by David S. Miller
parent 1c89a8e3d9
commit 66b51b0a03
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/socket.c
View file

@ -2697,8 +2697,7 @@ EXPORT_SYMBOL(sock_unregister);
bool sock_is_registered(int family)
{
return family < NPROTO &&
rcu_access_pointer(net_families[array_index_nospec(family, NPROTO)]);
return family < NPROTO && rcu_access_pointer(net_families[family]);
}
static int __init sock_init(void)