l2tp: close sessions before initiating tunnel delete

tomparkin · davem330 · commit 2b551c6e7d5b · 2013-03-20T12:10:38.000-04:00
When a user deletes a tunnel using netlink, all the sessions in the tunnel
should also be deleted.  Since running sessions will pin the tunnel socket
with the references they hold, have the l2tp_tunnel_delete close all sessions
in a tunnel before finally closing the tunnel socket.

Signed-off-by: Tom Parkin &lt;tparkin@katalix.com&gt;
Signed-off-by: James Chapman &lt;jchapman@katalix.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
@@ -1737,6 +1737,7 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_create);
  */
 int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)
 {
+	l2tp_tunnel_closeall(tunnel);
 	return (false == queue_work(l2tp_wq, &tunnel->del_work));
 }
 EXPORT_SYMBOL_GPL(l2tp_tunnel_delete);

Original file line number	Diff line number	Diff line change
`@@ -1737,6 +1737,7 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_create);`
`1737`	`1737`	`*/`
`1738`	`1738`	`int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)`
`1739`	`1739`	`{`
	`1740`	`+ l2tp_tunnel_closeall(tunnel);`
`1740`	`1741`	`return (false == queue_work(l2tp_wq, &tunnel->del_work));`
`1741`	`1742`	`}`
`1742`	`1743`	`EXPORT_SYMBOL_GPL(l2tp_tunnel_delete);`