Commit fa2d8ff4 authored Mar 30, 2015 by Thomas Graf Committed by David S. Miller Mar 31, 2015

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: 62b9c8d0 ("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>

parent 5899f047

net/openvswitch/vport.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**