[PATCH AUTOSEL 5.16 05/52] netfilter: nf_conntrack_netbios_ns: fix helper module alias

[PATCH AUTOSEL 5.16 05/52] netfilter: nf_conntrack_netbios_ns: fix helper module alias

[Sasha Levin]

From: Florian Westphal <fw@strlen.de>

[ Upstream commit 0e906607b9c5ee22312c9af4d8adb45c617ea38a ]

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.

Reported-by: Yi Chen <yiche@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/netfilter/nf_conntrack_netbios_ns.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_netbios_ns.c b/net/netfilter/nf_conntrack_netbios_ns.c
index 7f19ee2596090..55415f011943d 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,
-- 
2.34.1

Re: [PATCH AUTOSEL 5.16 05/52] netfilter: nf_conntrack_netbios_ns: fix helper module alias

[Jakub Kicinski]

On Thu,  3 Feb 2022 15:28:59 -0500 Sasha Levin wrote:
> Intentionally not adding a fixes-tag because i don't want this to go to
> stable. 

Ekhm. ;)

Re: [PATCH AUTOSEL 5.16 05/52] netfilter: nf_conntrack_netbios_ns: fix helper module alias

[Florian Westphal]

Jakub Kicinski <kuba@kernel.org> wrote:
> On Thu,  3 Feb 2022 15:28:59 -0500 Sasha Levin wrote:
> > Intentionally not adding a fixes-tag because i don't want this to go to
> > stable. 
> 
> Ekhm. ;)

Seems there is no way to hide fixes from stable guys :-)

Seriously, I don't think there is anything going to break here because
'modinfo nfct-helper-netbios_ns' and 'modinfo nfct-helper-netbios-ns'
return same module.

OTOH, this was noticed by pure coincidence; I don't think its
important to have it in stable.

Re: [PATCH AUTOSEL 5.16 05/52] netfilter: nf_conntrack_netbios_ns: fix helper module alias

[Sasha Levin]

On Thu, Feb 03, 2022 at 11:23:19PM +0100, Florian Westphal wrote:
>Jakub Kicinski <kuba@kernel.org> wrote:
>> On Thu,  3 Feb 2022 15:28:59 -0500 Sasha Levin wrote:
>> > Intentionally not adding a fixes-tag because i don't want this to go to
>> > stable.
>>
>> Ekhm. ;)
>
>Seems there is no way to hide fixes from stable guys :-)
>
>Seriously, I don't think there is anything going to break here because
>'modinfo nfct-helper-netbios_ns' and 'modinfo nfct-helper-netbios-ns'
>return same module.
>
>OTOH, this was noticed by pure coincidence; I don't think its
>important to have it in stable.

I'll drop it, thanks :)

-- 
Thanks,
Sasha