Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f5e7cd authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

ipv6: Fix conflict resolutions during ipv6 binding 



The ipv6 version of bind_conflict code calls ipv6_rcv_saddr_equal()
which at times wrongly identified intersections between addresses.
It particularly broke down under a few instances and caused erroneous
bind conflicts.

Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63d9950b

include/net/udp.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ static inline void udp_lib_close(struct sock *sk, long timeout) 
	sk_common_release(sk);

}



extern int	ipv4_rcv_saddr_equal(const struct sock *sk1,

				    const struct sock *sk2);

extern int	udp_lib_get_port(struct sock *sk, unsigned short snum,

		int (*)(const struct sock*,const struct sock*));

net/ipv4/udp.c

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum, 
	return error;

}



static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)

int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)

{

	struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
@@ -1819,6 +1819,7 @@ EXPORT_SYMBOL(udp_lib_getsockopt); 
EXPORT_SYMBOL(udp_lib_setsockopt);

EXPORT_SYMBOL(udp_poll);

EXPORT_SYMBOL(udp_lib_get_port);

EXPORT_SYMBOL(ipv4_rcv_saddr_equal);



#ifdef CONFIG_PROC_FS

EXPORT_SYMBOL(udp_proc_register);

net/ipv6/addrconf.c

+0 −34
Original line number Diff line number Diff line
@@ -1370,40 +1370,6 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add 
	return ifp;

}



int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)

{

	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;

	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);

	__be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr;

	__be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

	int sk_ipv6only = ipv6_only_sock(sk);

	int sk2_ipv6only = inet_v6_ipv6only(sk2);

	int addr_type = ipv6_addr_type(sk_rcv_saddr6);

	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;



	if (!sk2_rcv_saddr && !sk_ipv6only)

		return 1;



	if (addr_type2 == IPV6_ADDR_ANY &&

	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))

		return 1;



	if (addr_type == IPV6_ADDR_ANY &&

	    !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))

		return 1;



	if (sk2_rcv_saddr6 &&

	    ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))

		return 1;



	if (addr_type == IPV6_ADDR_MAPPED &&

	    !sk2_ipv6only &&

	    (!sk2_rcv_saddr || !sk_rcv_saddr || sk_rcv_saddr == sk2_rcv_saddr))

		return 1;



	return 0;

}



/* Gets referenced address, destroys ifaddr */



static void addrconf_dad_stop(struct inet6_ifaddr *ifp)

net/ipv6/udp.c

+28 −0
Original line number Diff line number Diff line
@@ -49,6 +49,34 @@ 
#include <linux/seq_file.h>

#include "udp_impl.h"



int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)

{

	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;

	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);

	int sk_ipv6only = ipv6_only_sock(sk);

	int sk2_ipv6only = inet_v6_ipv6only(sk2);

	int addr_type = ipv6_addr_type(sk_rcv_saddr6);

	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;



	/* if both are mapped, treat as IPv4 */

	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)

		return ipv4_rcv_saddr_equal(sk, sk2);



	if (addr_type2 == IPV6_ADDR_ANY &&

	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))

		return 1;



	if (addr_type == IPV6_ADDR_ANY &&

	    !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))

		return 1;



	if (sk2_rcv_saddr6 &&

	    ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))

		return 1;



	return 0;

}



int udp_v6_get_port(struct sock *sk, unsigned short snum)

{

	return udp_lib_get_port(sk, snum, ipv6_rcv_saddr_equal);

include/net/addrconf.h

+2 −2

File changed.

Contains only whitespace changes.