Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98ca74f4 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge branch 'ipvs' 



Simon Horman says:

====================
Fix for panic due use of tot_stats estimator outside of CONFIG_SYSCTL

It has been present since v3.6.39.
====================

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 91513606 9802d21e

net/netfilter/ipvs/ip_vs_ctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3778,6 +3778,7 @@ static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) 
	cancel_delayed_work_sync(&ipvs->defense_work);

	cancel_delayed_work_sync(&ipvs->defense_work);

	cancel_work_sync(&ipvs->defense_work.work);

	cancel_work_sync(&ipvs->defense_work.work);

	unregister_net_sysctl_table(ipvs->sysctl_hdr);

	unregister_net_sysctl_table(ipvs->sysctl_hdr);

	ip_vs_stop_estimator(net, &ipvs->tot_stats);

}

}





#else

#else
@@ -3840,7 +3841,6 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net) 
	struct netns_ipvs *ipvs = net_ipvs(net);

	struct netns_ipvs *ipvs = net_ipvs(net);





	ip_vs_trash_cleanup(net);

	ip_vs_trash_cleanup(net);

	ip_vs_stop_estimator(net, &ipvs->tot_stats);

	ip_vs_control_net_cleanup_sysctl(net);

	ip_vs_control_net_cleanup_sysctl(net);

	remove_proc_entry("ip_vs_stats_percpu", net->proc_net);

	remove_proc_entry("ip_vs_stats_percpu", net->proc_net);

	remove_proc_entry("ip_vs_stats", net->proc_net);

	remove_proc_entry("ip_vs_stats", net->proc_net);