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

Commit a2fc92be authored by David Ahern's avatar David Ahern Committed by Greg Kroah-Hartman
Browse files

ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address 



[ Upstream commit ec90ad334986fa5856d11dd272f7f22fa86c55c4 ]

Similar to c5ee066333eb ("ipv6: Consider sk_bound_dev_if when binding a
socket to an address"), binding a socket to v4 mapped addresses needs to
consider if the socket is bound to a device.

This problem also exists from the beginning of git history.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b68e5cf

net/ipv6/af_inet6.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -317,6 +317,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 




	/* Check if the address belongs to the host. */

	/* Check if the address belongs to the host. */

	if (addr_type == IPV6_ADDR_MAPPED) {

	if (addr_type == IPV6_ADDR_MAPPED) {

		struct net_device *dev = NULL;

		int chk_addr_ret;

		int chk_addr_ret;





		/* Binding to v4-mapped address on a v6-only socket

		/* Binding to v4-mapped address on a v6-only socket
@@ -327,9 +328,17 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
			goto out;

			goto out;

		}

		}





		if (sk->sk_bound_dev_if) {

			dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);

			if (!dev) {

				err = -ENODEV;

				goto out;

			}

		}



		/* Reproduce AF_INET checks to make the bindings consistent */

		/* Reproduce AF_INET checks to make the bindings consistent */

		v4addr = addr->sin6_addr.s6_addr32[3];

		v4addr = addr->sin6_addr.s6_addr32[3];

		chk_addr_ret = inet_addr_type(net, v4addr);

		chk_addr_ret = inet_addr_type_dev_table(net, dev, v4addr);

		if (!net->ipv4.sysctl_ip_nonlocal_bind &&

		if (!net->ipv4.sysctl_ip_nonlocal_bind &&

		    !(inet->freebind || inet->transparent) &&

		    !(inet->freebind || inet->transparent) &&

		    v4addr != htonl(INADDR_ANY) &&

		    v4addr != htonl(INADDR_ANY) &&