[PATCH 0/2] l2tp: l2tp_ip socket fixes

[PATCH 0/2] l2tp: l2tp_ip socket fixes

[James Chapman]

A couple of small fixes for the l2tp_ip socket support. This is for
L2TPv3 IP link encapsulation.

[PATCH 1/2] l2tp: fix refcount leak in l2tp_ip sockets
[PATCH 2/2] l2tp: don't overwrite source address in l2tp_ip_bind()

 net/l2tp/l2tp_ip.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

[PATCH 1/2] l2tp: fix refcount leak in l2tp_ip sockets

[James Chapman]

The l2tp_ip socket close handler does not update the module refcount
correctly which prevents module unload after the first bind() call on
an L2TPv3 IP encapulation socket.

Signed-off-by: James Chapman <jchapman@katalix.com>
---
 net/l2tp/l2tp_ip.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 55670ec..b56be14 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -232,7 +232,7 @@ static void l2tp_ip_close(struct sock *sk, long timeout)
 {
 	write_lock_bh(&l2tp_ip_lock);
 	hlist_del_init(&sk->sk_bind_node);
-	hlist_del_init(&sk->sk_node);
+	sk_del_node_init(sk);
 	write_unlock_bh(&l2tp_ip_lock);
 	sk_common_release(sk);
 }
-- 
1.7.0.4

[PATCH 2/2] l2tp: don't overwrite source address in l2tp_ip_bind()

[James Chapman]

Applications using L2TP/IP sockets want to be able to bind() an L2TP/IP
socket to set the local tunnel id while leaving the auto-assigned source
address alone. So if no source address is supplied, don't overwrite
the address already stored in the socket.

Signed-off-by: James Chapman <jchapman@katalix.com>
---
 net/l2tp/l2tp_ip.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index b56be14..585d93e 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -271,7 +271,8 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 	    chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
 		goto out;
 
-	inet->inet_rcv_saddr = inet->inet_saddr = addr->l2tp_addr.s_addr;
+	if (addr->l2tp_addr.s_addr)
+		inet->inet_rcv_saddr = inet->inet_saddr = addr->l2tp_addr.s_addr;
 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
 		inet->inet_saddr = 0;  /* Use device */
 	sk_dst_reset(sk);
-- 
1.7.0.4

Re: [PATCH 0/2] l2tp: l2tp_ip socket fixes

[David Miller]

From: James Chapman <jchapman@katalix.com>
Date: Tue, 10 Apr 2012 11:10:41 +0100

> A couple of small fixes for the l2tp_ip socket support. This is for
> L2TPv3 IP link encapsulation.
> 
> [PATCH 1/2] l2tp: fix refcount leak in l2tp_ip sockets
> [PATCH 2/2] l2tp: don't overwrite source address in l2tp_ip_bind()

Both applied, although I hope patch #2 doesn't unintentionally break
things for someone.  It's not unreasonable to think that someone may
be depending upon that saddr being set to INADDR_ANY in that case
you're changing.