2 files changed, 3 insertions, 2 deletions

diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index c37b5be7c5e4..3312a5849a97 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/tcp.h>
 #include <linux/workqueue.h>
+#include <linux/nospec.h>
 
 #include <linux/inet_diag.h>
 #include <linux/sock_diag.h>
@@ -218,6 +219,7 @@ static int __sock_diag_cmd(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         if (req->sdiag_family >= AF_MAX)
                 return -EINVAL;
+        req->sdiag_family = array_index_nospec(req->sdiag_family, AF_MAX);
 
         if (sock_diag_handlers[req->sdiag_family] == NULL)
                 sock_load_diag_module(req->sdiag_family, 0);
diff --git a/net/socket.c b/net/socket.c
index b91949168a87..270f28264cb1 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -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)