Commit ec54fef6 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Geliang Tang
Browse files

net: fill in MODULE_DESCRIPTION()s for SOCK_DIAG modules 

mainline inclusion
from mainline-v6.7-rc3
commit 938dbead34cd139c50c5d51cc58e18ef2f1c3d2c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=938dbead34cd139c50c5d51cc58e18ef2f1c3d2c



--------------------------------

W=1 builds now warn if module is built without a MODULE_DESCRIPTION().
Add descriptions to all the sock diag modules in one fell swoop.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent dcd9664a

net/ipv4/inet_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -1481,5 +1481,6 @@ static void __exit inet_diag_exit(void) 
module_init(inet_diag_init);

module_exit(inet_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("INET/INET6: socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2 /* AF_INET */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10 /* AF_INET6 */);

net/ipv4/raw_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -257,5 +257,6 @@ static void __exit raw_diag_exit(void) 
module_init(raw_diag_init);

module_exit(raw_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("RAW socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-255 /* AF_INET - IPPROTO_RAW */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10-255 /* AF_INET6 - IPPROTO_RAW */);

net/ipv4/tcp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -247,4 +247,5 @@ static void __exit tcp_diag_exit(void) 
module_init(tcp_diag_init);

module_exit(tcp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("TCP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-6 /* AF_INET - IPPROTO_TCP */);

net/ipv4/udp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -296,5 +296,6 @@ static void __exit udp_diag_exit(void) 
module_init(udp_diag_init);

module_exit(udp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("UDP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-17 /* AF_INET - IPPROTO_UDP */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-136 /* AF_INET - IPPROTO_UDPLITE */);

net/mptcp/mptcp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -245,4 +245,5 @@ static void __exit mptcp_diag_exit(void) 
module_init(mptcp_diag_init);

module_exit(mptcp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("MPTCP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-262 /* AF_INET - IPPROTO_MPTCP */);