sock_diag: add module pointer to "struct sock_diag_handler"
[ Upstream commit 114b4bb1cc19239b272d52ebbe156053483fe2f8 ] Following patch is going to use RCU instead of sock_diag_table_mutex acquisition. This patch is a preparation, no change of behavior yet. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Guillaume Nault <gnault@redhat.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Stable-dep-of: eb02688c5c45 ("ipv6: release nexthop on device removal") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5ef3e03228
commit
37103a9d7f
|
@ -13,6 +13,7 @@ struct nlmsghdr;
|
|||
struct sock;
|
||||
|
||||
struct sock_diag_handler {
|
||||
struct module *owner;
|
||||
__u8 family;
|
||||
int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
|
||||
int (*get_info)(struct sk_buff *skb, struct sock *sk);
|
||||
|
|
|
@ -1397,6 +1397,7 @@ int inet_diag_handler_get_info(struct sk_buff *skb, struct sock *sk)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler inet_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_INET,
|
||||
.dump = inet_diag_handler_cmd,
|
||||
.get_info = inet_diag_handler_get_info,
|
||||
|
@ -1404,6 +1405,7 @@ static const struct sock_diag_handler inet_diag_handler = {
|
|||
};
|
||||
|
||||
static const struct sock_diag_handler inet6_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_INET6,
|
||||
.dump = inet_diag_handler_cmd,
|
||||
.get_info = inet_diag_handler_get_info,
|
||||
|
|
|
@ -241,6 +241,7 @@ static int netlink_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler netlink_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_NETLINK,
|
||||
.dump = netlink_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -245,6 +245,7 @@ static int packet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler packet_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_PACKET,
|
||||
.dump = packet_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -250,6 +250,7 @@ static int smc_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler smc_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_SMC,
|
||||
.dump = smc_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -95,6 +95,7 @@ static int tipc_sock_diag_handler_dump(struct sk_buff *skb,
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler tipc_sock_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_TIPC,
|
||||
.dump = tipc_sock_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -322,6 +322,7 @@ static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler unix_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_UNIX,
|
||||
.dump = unix_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -157,6 +157,7 @@ static int vsock_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler vsock_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_VSOCK,
|
||||
.dump = vsock_diag_handler_dump,
|
||||
};
|
||||
|
|
|
@ -194,6 +194,7 @@ static int xsk_diag_handler_dump(struct sk_buff *nlskb, struct nlmsghdr *hdr)
|
|||
}
|
||||
|
||||
static const struct sock_diag_handler xsk_diag_handler = {
|
||||
.owner = THIS_MODULE,
|
||||
.family = AF_XDP,
|
||||
.dump = xsk_diag_handler_dump,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue