Skip to content

Commit 4bc3c8d

Browse files
Wang Haiummakynes
authored andcommitted
ipvs: fix possible memory leak in ip_vs_control_net_init
kmemleak report a memory leak as follows: BUG: memory leak unreferenced object 0xffff8880759ea000 (size 256): backtrace: [<00000000c0bf2deb>] kmem_cache_zalloc include/linux/slab.h:656 [inline] [<00000000c0bf2deb>] __proc_create+0x23d/0x7d0 fs/proc/generic.c:421 [<000000009d718d02>] proc_create_reg+0x8e/0x140 fs/proc/generic.c:535 [<0000000097bbfc4f>] proc_create_net_data+0x8c/0x1b0 fs/proc/proc_net.c:126 [<00000000652480fc>] ip_vs_control_net_init+0x308/0x13a0 net/netfilter/ipvs/ip_vs_ctl.c:4169 [<000000004c927ebe>] __ip_vs_init+0x211/0x400 net/netfilter/ipvs/ip_vs_core.c:2429 [<00000000aa6b72d9>] ops_init+0xa8/0x3c0 net/core/net_namespace.c:151 [<00000000153fd114>] setup_net+0x2de/0x7e0 net/core/net_namespace.c:341 [<00000000be4e4f07>] copy_net_ns+0x27d/0x530 net/core/net_namespace.c:482 [<00000000f1c23ec9>] create_new_namespaces+0x382/0xa30 kernel/nsproxy.c:110 [<00000000098a5757>] copy_namespaces+0x2e6/0x3b0 kernel/nsproxy.c:179 [<0000000026ce39e9>] copy_process+0x220a/0x5f00 kernel/fork.c:2072 [<00000000b71f4efe>] _do_fork+0xc7/0xda0 kernel/fork.c:2428 [<000000002974ee96>] __do_sys_clone3+0x18a/0x280 kernel/fork.c:2703 [<0000000062ac0a4d>] do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46 [<0000000093f1ce2c>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 In the error path of ip_vs_control_net_init(), remove_proc_entry() needs to be called to remove the added proc entry, otherwise a memory leak will occur. Also, add some '#ifdef CONFIG_PROC_FS' because proc_create_net* return NULL when PROC is not used. Fixes: b17fc99 ("IPVS: netns, ip_vs_stats and its procfs") Fixes: 61b1ab4 ("IPVS: netns, add basic init per netns.") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent c0700df commit 4bc3c8d

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

net/netfilter/ipvs/ip_vs_ctl.c

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4167,19 +4167,36 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
41674167

41684168
spin_lock_init(&ipvs->tot_stats.lock);
41694169

4170-
proc_create_net("ip_vs", 0, ipvs->net->proc_net, &ip_vs_info_seq_ops,
4171-
sizeof(struct ip_vs_iter));
4172-
proc_create_net_single("ip_vs_stats", 0, ipvs->net->proc_net,
4173-
ip_vs_stats_show, NULL);
4174-
proc_create_net_single("ip_vs_stats_percpu", 0, ipvs->net->proc_net,
4175-
ip_vs_stats_percpu_show, NULL);
4170+
#ifdef CONFIG_PROC_FS
4171+
if (!proc_create_net("ip_vs", 0, ipvs->net->proc_net,
4172+
&ip_vs_info_seq_ops, sizeof(struct ip_vs_iter)))
4173+
goto err_vs;
4174+
if (!proc_create_net_single("ip_vs_stats", 0, ipvs->net->proc_net,
4175+
ip_vs_stats_show, NULL))
4176+
goto err_stats;
4177+
if (!proc_create_net_single("ip_vs_stats_percpu", 0,
4178+
ipvs->net->proc_net,
4179+
ip_vs_stats_percpu_show, NULL))
4180+
goto err_percpu;
4181+
#endif
41764182

41774183
if (ip_vs_control_net_init_sysctl(ipvs))
41784184
goto err;
41794185

41804186
return 0;
41814187

41824188
err:
4189+
#ifdef CONFIG_PROC_FS
4190+
remove_proc_entry("ip_vs_stats_percpu", ipvs->net->proc_net);
4191+
4192+
err_percpu:
4193+
remove_proc_entry("ip_vs_stats", ipvs->net->proc_net);
4194+
4195+
err_stats:
4196+
remove_proc_entry("ip_vs", ipvs->net->proc_net);
4197+
4198+
err_vs:
4199+
#endif
41834200
free_percpu(ipvs->tot_stats.cpustats);
41844201
return -ENOMEM;
41854202
}
@@ -4188,9 +4205,11 @@ void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs)
41884205
{
41894206
ip_vs_trash_cleanup(ipvs);
41904207
ip_vs_control_net_cleanup_sysctl(ipvs);
4208+
#ifdef CONFIG_PROC_FS
41914209
remove_proc_entry("ip_vs_stats_percpu", ipvs->net->proc_net);
41924210
remove_proc_entry("ip_vs_stats", ipvs->net->proc_net);
41934211
remove_proc_entry("ip_vs", ipvs->net->proc_net);
4212+
#endif
41944213
free_percpu(ipvs->tot_stats.cpustats);
41954214
}
41964215

0 commit comments

Comments
 (0)