]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
l2tp: take a reference for kernel sockets in l2tp_tunnel_sock_lookup
authorTom Parkin <tparkin@katalix.com>
Tue, 19 Mar 2013 06:11:17 +0000 (06:11 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Mar 2013 16:10:38 +0000 (12:10 -0400)
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>
net/l2tp/l2tp_core.c

index 0dd50c079f29eb76d4270844d178e098b42a2af4..45373fee38c544d88c335917c0ebd666ca1d0237 100644 (file)
@@ -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);