Commit eb7903bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'l2tp-socket-lookup-fixes' 



Guillaume Nault says:

====================
l2tp: socket lookup fixes for l2tp_ip and l2tp_ip6

There are still some cases that aren't correctly handled in the socket
lookup functions of l2tp_ip and l2tp_ip6. This series fixes lookups for
connected sockets and for sockets bound to the IPv6 unspecified
address.

bind() and connect() should now work as expected on IPPROTO_L2TP
sockets. Extra features, like SO_REUSEADDR, remain unsupported.

The matching conditions in __l2tp_ip6_bind_lookup() and
__l2tp_ip_bind_lookup() are getting hard to read. I've kept the single
test approach to make the intend of the patches clear. I'll split the
conditionals once these fixes reach net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4200462d a9b2dff8

net/l2tp/l2tp_ip.c

+6 −13
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ static inline struct l2tp_ip_sock *l2tp_ip_sk(const struct sock *sk) 
	return (struct l2tp_ip_sock *)sk;

}



static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif, u32 tunnel_id)

static struct sock *__l2tp_ip_bind_lookup(const struct net *net, __be32 laddr,

					  __be32 raddr, int dif, u32 tunnel_id)

{

	struct sock *sk;
@@ -61,6 +62,7 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif 
		if ((l2tp->conn_id == tunnel_id) &&

		    net_eq(sock_net(sk), net) &&

		    !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&

		    (!inet->inet_daddr || !raddr || inet->inet_daddr == raddr) &&

		    (!sk->sk_bound_dev_if || !dif ||

		     sk->sk_bound_dev_if == dif))

			goto found;
@@ -71,15 +73,6 @@ found: 
	return sk;

}



static inline struct sock *l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif, u32 tunnel_id)

{

	struct sock *sk = __l2tp_ip_bind_lookup(net, laddr, dif, tunnel_id);

	if (sk)

		sock_hold(sk);



	return sk;

}



/* When processing receive frames, there are two cases to

 * consider. Data frames consist of a non-zero session-id and an

 * optional cookie. Control frames consist of a regular L2TP header
@@ -183,8 +176,8 @@ pass_up: 
		struct iphdr *iph = (struct iphdr *) skb_network_header(skb);



		read_lock_bh(&l2tp_ip_lock);

		sk = __l2tp_ip_bind_lookup(net, iph->daddr, inet_iif(skb),

					   tunnel_id);

		sk = __l2tp_ip_bind_lookup(net, iph->daddr, iph->saddr,

					   inet_iif(skb), tunnel_id);

		if (!sk) {

			read_unlock_bh(&l2tp_ip_lock);

			goto discard;
@@ -280,7 +273,7 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
		inet->inet_saddr = 0;  /* Use device */



	write_lock_bh(&l2tp_ip_lock);

	if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr,

	if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr, 0,

				  sk->sk_bound_dev_if, addr->l2tp_conn_id)) {

		write_unlock_bh(&l2tp_ip_lock);

		ret = -EADDRINUSE;

net/l2tp/l2tp_ip6.c

+8 −16
Original line number Diff line number Diff line
@@ -59,12 +59,14 @@ static inline struct l2tp_ip6_sock *l2tp_ip6_sk(const struct sock *sk) 


static struct sock *__l2tp_ip6_bind_lookup(struct net *net,

					   struct in6_addr *laddr,

					   const struct in6_addr *raddr,

					   int dif, u32 tunnel_id)

{

	struct sock *sk;



	sk_for_each_bound(sk, &l2tp_ip6_bind_table) {

		const struct in6_addr *addr = inet6_rcv_saddr(sk);

		const struct in6_addr *sk_laddr = inet6_rcv_saddr(sk);

		const struct in6_addr *sk_raddr = &sk->sk_v6_daddr;

		struct l2tp_ip6_sock *l2tp = l2tp_ip6_sk(sk);



		if (l2tp == NULL)
@@ -72,7 +74,8 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net, 


		if ((l2tp->conn_id == tunnel_id) &&

		    net_eq(sock_net(sk), net) &&

		    (!addr || ipv6_addr_equal(addr, laddr)) &&

		    (!sk_laddr || ipv6_addr_any(sk_laddr) || ipv6_addr_equal(sk_laddr, laddr)) &&

		    (!raddr || ipv6_addr_any(sk_raddr) || ipv6_addr_equal(sk_raddr, raddr)) &&

		    (!sk->sk_bound_dev_if || !dif ||

		     sk->sk_bound_dev_if == dif))

			goto found;
@@ -83,17 +86,6 @@ found: 
	return sk;

}



static inline struct sock *l2tp_ip6_bind_lookup(struct net *net,

						struct in6_addr *laddr,

						int dif, u32 tunnel_id)

{

	struct sock *sk = __l2tp_ip6_bind_lookup(net, laddr, dif, tunnel_id);

	if (sk)

		sock_hold(sk);



	return sk;

}



/* When processing receive frames, there are two cases to

 * consider. Data frames consist of a non-zero session-id and an

 * optional cookie. Control frames consist of a regular L2TP header
@@ -197,8 +189,8 @@ pass_up: 
		struct ipv6hdr *iph = ipv6_hdr(skb);



		read_lock_bh(&l2tp_ip6_lock);

		sk = __l2tp_ip6_bind_lookup(net, &iph->daddr, inet6_iif(skb),

					    tunnel_id);

		sk = __l2tp_ip6_bind_lookup(net, &iph->daddr, &iph->saddr,

					    inet6_iif(skb), tunnel_id);

		if (!sk) {

			read_unlock_bh(&l2tp_ip6_lock);

			goto discard;
@@ -330,7 +322,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	rcu_read_unlock();



	write_lock_bh(&l2tp_ip6_lock);

	if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr, bound_dev_if,

	if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr, NULL, bound_dev_if,

				   addr->l2tp_conn_id)) {

		write_unlock_bh(&l2tp_ip6_lock);

		err = -EADDRINUSE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE