---

yaml --- r: 361794 b: refs/heads/master c: 8abbbe8 h: refs/heads/master v: v3
git-mirror · Mar 20, 2013 · 78ec4f5 · 78ec4f5
1 parent e38eaad
commit 78ec4f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b551c6e7d5bca2c78c216b15ef675653d4f459a
+refs/heads/master: 8abbbe8ff572fd84d1b98eb9acf30611a97cf72e
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
@@ -191,6 +191,7 @@ struct sock *l2tp_tunnel_sock_lookup(struct l2tp_tunnel *tunnel)
 	} else {
 		/* Socket is owned by kernelspace */
 		sk = tunnel->sock;
+		sock_hold(sk);
 	}
 
 out:
@@ -209,6 +210,7 @@ void l2tp_tunnel_sock_put(struct sock *sk)
 		}
 		sock_put(sk);
 	}
+	sock_put(sk);
 }
 EXPORT_SYMBOL_GPL(l2tp_tunnel_sock_put);