Skip to content

Commit 0734669

Browse files
slavin-ayuUlrich Hecht
authored andcommitted
ipvs: Defer ip_vs_ftp unregister during netns cleanup
[ Upstream commit 134121bfd99a06d44ef5ba15a9beb075297c0821 ] On the netns cleanup path, __ip_vs_ftp_exit() may unregister ip_vs_ftp before connections with valid cp->app pointers are flushed, leading to a use-after-free. Fix this by introducing a global `exiting_module` flag, set to true in ip_vs_ftp_exit() before unregistering the pernet subsystem. In __ip_vs_ftp_exit(), skip ip_vs_ftp unregister if called during netns cleanup (when exiting_module is false) and defer it to __ip_vs_cleanup_batch(), which unregisters all apps after all connections are flushed. If called during module exit, unregister ip_vs_ftp immediately. Fixes: 61b1ab4 ("IPVS: netns, add basic init per netns.") Suggested-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Slavin Liu <slavin452@gmail.com> Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent 98ca649 commit 0734669

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

net/netfilter/ipvs/ip_vs_ftp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ enum {
5959
IP_VS_FTP_EPSV,
6060
};
6161

62+
static bool exiting_module;
6263
/*
6364
* List of ports (up to IP_VS_APP_MAX_PORTS) to be handled by helper
6465
* First port is set to the default port.
@@ -613,7 +614,7 @@ static void __ip_vs_ftp_exit(struct net *net)
613614
{
614615
struct netns_ipvs *ipvs = net_ipvs(net);
615616

616-
if (!ipvs)
617+
if (!ipvs || !exiting_module)
617618
return;
618619

619620
unregister_ip_vs_app(ipvs, &ip_vs_ftp);
@@ -635,6 +636,7 @@ static int __init ip_vs_ftp_init(void)
635636
*/
636637
static void __exit ip_vs_ftp_exit(void)
637638
{
639+
exiting_module = true;
638640
unregister_pernet_subsys(&ip_vs_ftp_ops);
639641
/* rcu_barrier() is called by netns */
640642
}

0 commit comments

Comments
 (0)