diff options
| author | Tom Parkin <tparkin@katalix.com> | 2013-03-19 02:11:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:10:38 -0400 |
| commit | 8abbbe8ff572fd84d1b98eb9acf30611a97cf72e (patch) | |
| tree | b0ad882a2b2fca7777d01bbbe873da57e1c42609 /net | |
| parent | 2b551c6e7d5bca2c78c216b15ef675653d4f459a (diff) | |
l2tp: take a reference for kernel sockets in l2tp_tunnel_sock_lookup
When looking up the tunnel socket in struct l2tp_tunnel, hold a reference
whether the socket was created by the kernel or by userspace.
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 0dd50c079f29..45373fee38c5 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c | |||
| @@ -191,6 +191,7 @@ struct sock *l2tp_tunnel_sock_lookup(struct l2tp_tunnel *tunnel) | |||
| 191 | } else { | 191 | } else { |
| 192 | /* Socket is owned by kernelspace */ | 192 | /* Socket is owned by kernelspace */ |
| 193 | sk = tunnel->sock; | 193 | sk = tunnel->sock; |
| 194 | sock_hold(sk); | ||
| 194 | } | 195 | } |
| 195 | 196 | ||
| 196 | out: | 197 | out: |
| @@ -209,6 +210,7 @@ void l2tp_tunnel_sock_put(struct sock *sk) | |||
| 209 | } | 210 | } |
| 210 | sock_put(sk); | 211 | sock_put(sk); |
| 211 | } | 212 | } |
| 213 | sock_put(sk); | ||
| 212 | } | 214 | } |
| 213 | EXPORT_SYMBOL_GPL(l2tp_tunnel_sock_put); | 215 | EXPORT_SYMBOL_GPL(l2tp_tunnel_sock_put); |
| 214 | 216 | ||
