Commit 0f8d3c7a authored Mar 24, 2009 by Vlad Yasevich Committed by David S. Miller Mar 24, 2009

ipv6: Allow ipv4 wildcard binds after ipv6 address binds



The IPv4 wildcard (0.0.0.0) address does not intersect
in any way with explicit IPv6 addresses.  These two should
be permitted, but the IPv4 conflict code checks the ipv6only
bit as part of the test.  Since binding to an explicit IPv6
address restricts the socket to only that IPv6 address, the
side-effect is that the socket behaves as v6-only.  By
explicitely setting ipv6only in this case, allows the 2 binds
to succeed.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 783ed5a7

net/ipv6/af_inet6.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -346,8 +346,11 @@ int inet6_bind(struct socket sock, struct sockaddr uaddr, int addr_len)
		goto out;
		}

		if (addr_type != IPV6_ADDR_ANY)
		if (addr_type != IPV6_ADDR_ANY) {
		sk->sk_userlocks \|= SOCK_BINDADDR_LOCK;
		if (addr_type != IPV6_ADDR_MAPPED)
		np->ipv6only = 1;
		}
		if (snum)
		sk->sk_userlocks \|= SOCK_BINDPORT_LOCK;
		inet->sport = htons(inet->num);

Admin message