Commit c34c1287 authored by Andrei Vagin's avatar Andrei Vagin Committed by David S. Miller

sock_diag: fix autoloading of the raw_diag module

IPPROTO_RAW isn't registred as an inet protocol, so
inet_protos[protocol] is always NULL for it.

Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Xin Long <lucien.xin@gmail.com>
Fixes: bf2ae2e4 ("sock_diag: request _diag module only when the family or proto has been registered")
Signed-off-by: default avatarAndrei Vagin <avagin@gmail.com>
Reviewed-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d016b4a3
...@@ -3279,6 +3279,7 @@ int sock_load_diag_module(int family, int protocol) ...@@ -3279,6 +3279,7 @@ int sock_load_diag_module(int family, int protocol)
#ifdef CONFIG_INET #ifdef CONFIG_INET
if (family == AF_INET && if (family == AF_INET &&
protocol != IPPROTO_RAW &&
!rcu_access_pointer(inet_protos[protocol])) !rcu_access_pointer(inet_protos[protocol]))
return -ENOENT; return -ENOENT;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment