summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-03-30 13:57:41 +0200
committerDavid S. Miller <davem@davemloft.net>2015-03-31 15:59:50 -0400
commitfa2d8ff4e3522b4e05f590575d3eb8087f3a8cdc (patch)
tree20fa81f468f65e08a7e2470397f7fbf142cb5ca4 /net
parent5899f0478528b59ea9ced201eacb3e56ca406c39 (diff)
downloadop-kernel-dev-fa2d8ff4e3522b4e05f590575d3eb8087f3a8cdc.zip
op-kernel-dev-fa2d8ff4e3522b4e05f590575d3eb8087f3a8cdc.tar.gz
openvswitch: Return vport module ref before destruction
Return module reference before invoking the respective vport ->destroy() function. This is needed as ovs_vport_del() is not invoked inside an RCU read side critical section so the kfree can occur immediately before returning to ovs_vport_del(). Returning the module reference before ->destroy() is safe because the module unregistration is blocked on ovs_lock which we hold while destroying the datapath. Fixes: 62b9c8d0372d ("ovs: Turn vports with dependencies into separate modules") Reported-by: Pravin Shelar <pshelar@nicira.com> Signed-off-by: Thomas Graf <tgraf@suug.ch> Acked-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/vport.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index ec2954f..067a3ff 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -274,10 +274,8 @@ void ovs_vport_del(struct vport *vport)
ASSERT_OVSL();
hlist_del_rcu(&vport->hash_node);
-
- vport->ops->destroy(vport);
-
module_put(vport->ops->owner);
+ vport->ops->destroy(vport);
}
/**
OpenPOWER on IntegriCloud