diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2011-12-14 21:43:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 13:48:27 -0500 |
commit | aec8dc62f66199aef153d86e1f90d9c1d14696e3 (patch) | |
tree | bdf927f62708cfa5b7a0561725ab76da8ac2ceb2 /net/ipv4 | |
parent | e7c466e58eb1ff9bf49c2f3902622dc11a8c7022 (diff) |
sock_diag: Fix module netlink aliases
I've made a mistake when fixing the sock_/inet_diag aliases :(
1. The sock_diag layer should request the family-based alias,
not just the IPPROTO_IP one;
2. The inet_diag layer should request for AF_INET+protocol alias,
not just the protocol one.
Thus fix this.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inet_diag.c | 7 | ||||
-rw-r--r-- | net/ipv4/tcp_diag.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp_diag.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 575e28c57cc..fa27313765f 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
@@ -54,8 +54,8 @@ static DEFINE_MUTEX(inet_diag_table_mutex); | |||
54 | static const struct inet_diag_handler *inet_diag_lock_handler(int proto) | 54 | static const struct inet_diag_handler *inet_diag_lock_handler(int proto) |
55 | { | 55 | { |
56 | if (!inet_diag_table[proto]) | 56 | if (!inet_diag_table[proto]) |
57 | request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK, | 57 | request_module("net-pf-%d-proto-%d-type-%d-%d", PF_NETLINK, |
58 | NETLINK_SOCK_DIAG, proto); | 58 | NETLINK_SOCK_DIAG, AF_INET, proto); |
59 | 59 | ||
60 | mutex_lock(&inet_diag_table_mutex); | 60 | mutex_lock(&inet_diag_table_mutex); |
61 | if (!inet_diag_table[proto]) | 61 | if (!inet_diag_table[proto]) |
@@ -1087,4 +1087,5 @@ static void __exit inet_diag_exit(void) | |||
1087 | module_init(inet_diag_init); | 1087 | module_init(inet_diag_init); |
1088 | module_exit(inet_diag_exit); | 1088 | module_exit(inet_diag_exit); |
1089 | MODULE_LICENSE("GPL"); | 1089 | MODULE_LICENSE("GPL"); |
1090 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 0); | 1090 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2 /* AF_INET */); |
1091 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10 /* AF_INET6 */); | ||
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index 6334b1f71f2..8cd357a8be7 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c | |||
@@ -66,4 +66,4 @@ static void __exit tcp_diag_exit(void) | |||
66 | module_init(tcp_diag_init); | 66 | module_init(tcp_diag_init); |
67 | module_exit(tcp_diag_exit); | 67 | module_exit(tcp_diag_exit); |
68 | MODULE_LICENSE("GPL"); | 68 | MODULE_LICENSE("GPL"); |
69 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 6); | 69 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-6 /* AF_INET - IPPROTO_TCP */); |
diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c index 27910c13301..fe9db8675ac 100644 --- a/net/ipv4/udp_diag.c +++ b/net/ipv4/udp_diag.c | |||
@@ -197,5 +197,5 @@ static void __exit udp_diag_exit(void) | |||
197 | module_init(udp_diag_init); | 197 | module_init(udp_diag_init); |
198 | module_exit(udp_diag_exit); | 198 | module_exit(udp_diag_exit); |
199 | MODULE_LICENSE("GPL"); | 199 | MODULE_LICENSE("GPL"); |
200 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 17); | 200 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-17 /* AF_INET - IPPROTO_UDP */); |
201 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 136); | 201 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-136 /* AF_INET - IPPROTO_UDPLITE */); |