diff options
author | Jeremy Cline <jcline@redhat.com> | 2018-07-27 18:43:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-29 01:43:30 -0400 |
commit | e978de7a6d382ec378830ca2cf38e902df0b6d84 (patch) | |
tree | 2d9f35288b60c467f18e5e81891c0a198a8adad3 | |
parent | c8e8cd579bb4265651df8223730105341e61a2d1 (diff) |
net: socket: Fix potential spectre v1 gadget in sock_is_registered
'family' can be a user-controlled value, so sanitize it after the bounds
check to avoid speculative out-of-bounds access.
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeremy Cline <jcline@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 4ac3b834cce9..8c24d5dc4bc8 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -2690,7 +2690,8 @@ EXPORT_SYMBOL(sock_unregister); | |||
2690 | 2690 | ||
2691 | bool sock_is_registered(int family) | 2691 | bool sock_is_registered(int family) |
2692 | { | 2692 | { |
2693 | return family < NPROTO && rcu_access_pointer(net_families[family]); | 2693 | return family < NPROTO && |
2694 | rcu_access_pointer(net_families[array_index_nospec(family, NPROTO)]); | ||
2694 | } | 2695 | } |
2695 | 2696 | ||
2696 | static int __init sock_init(void) | 2697 | static int __init sock_init(void) |