openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipvs: fix oops in ip_vs_dst_event on rmmod 

After commit 39f618b4fd (3.4)
"ipvs: reset ipvs pointer in netns" we can oops in
ip_vs_dst_event on rmmod ip_vs because ip_vs_control_cleanup
is called after the ipvs_core_ops subsys is unregistered and
net->ipvs is NULL. Fix it by exiting early from ip_vs_dst_event
if ipvs is NULL. It is safe because all services and dests
for the net are already freed.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Julian Anastasov 2012-07-07 20:30:11 +03:00 committed by Pablo Neira Ayuso
parent 9e33ce453f
commit 283283c4da
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -1521,11 +1521,12 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
{ {
struct net_device *dev = ptr; struct net_device *dev = ptr;
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct ip_vs_dest *dest; struct ip_vs_dest *dest;
unsigned int idx; unsigned int idx;
if (event != NETDEV_UNREGISTER) if (event != NETDEV_UNREGISTER || !ipvs)
return NOTIFY_DONE; return NOTIFY_DONE;
IP_VS_DBG(3, "%s() dev=%s\n", __func__, dev->name); IP_VS_DBG(3, "%s() dev=%s\n", __func__, dev->name);
EnterFunction(2); EnterFunction(2);
@ -1551,7 +1552,7 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
} }
} }
list_for_each_entry(dest, &net_ipvs(net)->dest_trash, n_list) { list_for_each_entry(dest, &ipvs->dest_trash, n_list) {
__ip_vs_dev_reset(dest, dev); __ip_vs_dev_reset(dest, dev);
} }
mutex_unlock(&__ip_vs_mutex); mutex_unlock(&__ip_vs_mutex);