Merge tag 'wireless-drivers-for-davem-2018-11-20' of git://git.kernel.org/pub/scm...

[sfrench/cifs-2.6.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 6fcc4bc07d19bd929648f03b136225a69f2eddfc..080a880a1761b8e0efafaddf0ddac5bb87c64f88 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3279,6 +3279,7 @@ int sock_load_diag_module(int family, int protocol)
 
 #ifdef CONFIG_INET
        if (family == AF_INET &&
+           protocol != IPPROTO_RAW &&
            !rcu_access_pointer(inet_protos[protocol]))
                return -ENOENT;
 #endif