Commit 0340bc28 authored Jun 15, 2023 by Pablo Neira Ayuso Committed by sanglipeng Nov 30, 2023

netfilter: nfnetlink_osf: fix module autoload

stable inclusion
from stable-v5.10.186
commit 5702afa2c331af560f0a1f2da7a360b36b536f03
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8J4KH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5702afa2c331af560f0a1f2da7a360b36b536f03



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

[ Upstream commit 62f9a68a ]

Move the alias from xt_osf to nfnetlink_osf.

Fixes: f9324952 ("netfilter: nfnetlink_osf: extract nfnetlink_subsystem code from xt_osf.c")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 67216c05

net/netfilter/nfnetlink_osf.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -448,3 +448,4 @@ module_init(nfnl_osf_init);
		module_exit(nfnl_osf_fini);

		MODULE_LICENSE("GPL");
		MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_OSF);

net/netfilter/xt_osf.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,4 +71,3 @@ MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
		MODULE_DESCRIPTION("Passive OS fingerprint matching.");
		MODULE_ALIAS("ipt_osf");
		MODULE_ALIAS("ip6t_osf");
		MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_OSF);