From 78ec4f58266ebd8329835182e971b5d5af260b70 Mon Sep 17 00:00:00 2001
From: Tom Parkin <tparkin@katalix.com>
Date: Tue, 19 Mar 2013 06:11:17 +0000
Subject: [PATCH] --- yaml --- r: 361794 b: refs/heads/master c:
 8abbbe8ff572fd84d1b98eb9acf30611a97cf72e h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/l2tp/l2tp_core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 53f64a9a0211..d88b408463ee 100644
--- 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
index 0dd50c079f29..45373fee38c5 100644
--- 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);