shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "sock_diag: add module pointer to "struct sock_diag_handler""

Browse Source 
This reverts commit 9c116890ae which is
commit 114b4bb1cc19239b272d52ebbe156053483fe2f8 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ic1ec5456033ee5912e94492fa1c39b71a7b60a24
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-12-17 10:13:43 +00:00
parent 6101867a91
commit c80fef4574
9 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sock_diag.h
View File

@@ -13,7 +13,6 @@ struct nlmsghdr;
struct sock; struct sock;
struct sock_diag_handler { struct sock_diag_handler {
struct module *owner;
__u8 family; __u8 family;
int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh); int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
int (*get_info)(struct sk_buff *skb, struct sock *sk); int (*get_info)(struct sk_buff *skb, struct sock *sk);

2
net/ipv4/inet_diag.c
View File

@@ -1397,7 +1397,6 @@ int inet_diag_handler_get_info(struct sk_buff *skb, struct sock *sk)
} }
static const struct sock_diag_handler inet_diag_handler = { static const struct sock_diag_handler inet_diag_handler = {
.owner = THIS_MODULE,
.family = AF_INET, .family = AF_INET,
.dump = inet_diag_handler_cmd, .dump = inet_diag_handler_cmd,
.get_info = inet_diag_handler_get_info, .get_info = inet_diag_handler_get_info,
@@ -1405,7 +1404,6 @@ static const struct sock_diag_handler inet_diag_handler = {
}; };
static const struct sock_diag_handler inet6_diag_handler = { static const struct sock_diag_handler inet6_diag_handler = {
.owner = THIS_MODULE,
.family = AF_INET6, .family = AF_INET6,
.dump = inet_diag_handler_cmd, .dump = inet_diag_handler_cmd,
.get_info = inet_diag_handler_get_info, .get_info = inet_diag_handler_get_info,

1
net/netlink/diag.c
View File

@@ -241,7 +241,6 @@ static int netlink_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
} }
static const struct sock_diag_handler netlink_diag_handler = { static const struct sock_diag_handler netlink_diag_handler = {
.owner = THIS_MODULE,
.family = AF_NETLINK, .family = AF_NETLINK,
.dump = netlink_diag_handler_dump, .dump = netlink_diag_handler_dump,
}; };

1
net/packet/diag.c
View File

@@ -245,7 +245,6 @@ static int packet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
} }
static const struct sock_diag_handler packet_diag_handler = { static const struct sock_diag_handler packet_diag_handler = {
.owner = THIS_MODULE,
.family = AF_PACKET, .family = AF_PACKET,
.dump = packet_diag_handler_dump, .dump = packet_diag_handler_dump,
}; };

1
net/smc/smc_diag.c
View File

@@ -249,7 +249,6 @@ static int smc_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
} }
static const struct sock_diag_handler smc_diag_handler = { static const struct sock_diag_handler smc_diag_handler = {
.owner = THIS_MODULE,
.family = AF_SMC, .family = AF_SMC,
.dump = smc_diag_handler_dump, .dump = smc_diag_handler_dump,
}; };

1
net/tipc/diag.c
View File

@@ -95,7 +95,6 @@ static int tipc_sock_diag_handler_dump(struct sk_buff *skb,
} }
static const struct sock_diag_handler tipc_sock_diag_handler = { static const struct sock_diag_handler tipc_sock_diag_handler = {
.owner = THIS_MODULE,
.family = AF_TIPC, .family = AF_TIPC,
.dump = tipc_sock_diag_handler_dump, .dump = tipc_sock_diag_handler_dump,
}; };

1
net/unix/diag.c
View File

@@ -322,7 +322,6 @@ static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
} }
static const struct sock_diag_handler unix_diag_handler = { static const struct sock_diag_handler unix_diag_handler = {
.owner = THIS_MODULE,
.family = AF_UNIX, .family = AF_UNIX,
.dump = unix_diag_handler_dump, .dump = unix_diag_handler_dump,
}; };

1
net/vmw_vsock/diag.c
View File

@@ -157,7 +157,6 @@ static int vsock_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
} }
static const struct sock_diag_handler vsock_diag_handler = { static const struct sock_diag_handler vsock_diag_handler = {
.owner = THIS_MODULE,
.family = AF_VSOCK, .family = AF_VSOCK,
.dump = vsock_diag_handler_dump, .dump = vsock_diag_handler_dump,
}; };

1
net/xdp/xsk_diag.c
View File

@@ -194,7 +194,6 @@ static int xsk_diag_handler_dump(struct sk_buff *nlskb, struct nlmsghdr *hdr)
} }
static const struct sock_diag_handler xsk_diag_handler = { static const struct sock_diag_handler xsk_diag_handler = {
.owner = THIS_MODULE,
.family = AF_XDP, .family = AF_XDP,
.dump = xsk_diag_handler_dump, .dump = xsk_diag_handler_dump,
}; };