Message ID | 20220120125212.991271-2-pablo@netfilter.org |
---|---|
State | Accepted, archived |
Delegated to: | Pablo Neira |
Headers | show |
Series | [net,1/5] netfilter: nf_conntrack_netbios_ns: fix helper module alias | expand |
Hello: This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <pablo@netfilter.org>: On Thu, 20 Jan 2022 13:52:08 +0100 you wrote: > From: Florian Westphal <fw@strlen.de> > > The helper gets registered as 'netbios-ns', not netbios_ns. > Intentionally not adding a fixes-tag because i don't want this to go to > stable. This wasn't noticed for a very long time so no so no need to risk > regressions. > > [...] Here is the summary with links: - [net,1/5] netfilter: nf_conntrack_netbios_ns: fix helper module alias https://git.kernel.org/netdev/net/c/0e906607b9c5 - [net,2/5] netfilter: nf_tables: remove unused variable https://git.kernel.org/netdev/net/c/cf46eacbc156 - [net,3/5] netfilter: nf_tables: set last expression in register tracking area https://git.kernel.org/netdev/net/c/fe75e84a8fe1 - [net,4/5] netfilter: nft_connlimit: memleak if nf_ct_netns_get() fails https://git.kernel.org/netdev/net/c/7d70984a1ad4 - [net,5/5] netfilter: conntrack: don't increment invalid counter on NF_REPEAT https://git.kernel.org/netdev/net/c/830af2eba403 You are awesome, thank you!
diff --git a/net/netfilter/nf_conntrack_netbios_ns.c b/net/netfilter/nf_conntrack_netbios_ns.c index 7f19ee259609..55415f011943 100644 --- a/net/netfilter/nf_conntrack_netbios_ns.c +++ b/net/netfilter/nf_conntrack_netbios_ns.c @@ -20,13 +20,14 @@ #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_expect.h> +#define HELPER_NAME "netbios-ns" #define NMBD_PORT 137 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>"); MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper"); MODULE_LICENSE("GPL"); MODULE_ALIAS("ip_conntrack_netbios_ns"); -MODULE_ALIAS_NFCT_HELPER("netbios_ns"); +MODULE_ALIAS_NFCT_HELPER(HELPER_NAME); static unsigned int timeout __read_mostly = 3; module_param(timeout, uint, 0400); @@ -44,7 +45,7 @@ static int netbios_ns_help(struct sk_buff *skb, unsigned int protoff, } static struct nf_conntrack_helper helper __read_mostly = { - .name = "netbios-ns", + .name = HELPER_NAME, .tuple.src.l3num = NFPROTO_IPV4, .tuple.src.u.udp.port = cpu_to_be16(NMBD_PORT), .tuple.dst.protonum = IPPROTO_UDP,