diff mbox series

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

Message ID 20190105005815.25120-1-dsahern@kernel.org
State Accepted
Delegated to: David Miller
Headers show
Series [net] ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address | expand

Commit Message

David Ahern Jan. 5, 2019, 12:58 a.m. UTC 
From: David Ahern <dsahern@gmail.com>

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: David Ahern <dsahern@gmail.com>
---
 net/ipv6/af_inet6.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

David Miller Jan. 5, 2019, 1:20 a.m. UTC | #1 
From: David Ahern <dsahern@kernel.org>
Date: Fri,  4 Jan 2019 16:58:15 -0800

> From: David Ahern <dsahern@gmail.com>
> 
> 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: David Ahern <dsahern@gmail.com>

Applied and queued up for -stable, thanks David.
diff mbox series

Patch

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 0bfb6cc0a30a..9d74423da4c4 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -310,6 +310,7 @@  static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
 
 	/* Check if the address belongs to the host. */
 	if (addr_type == IPV6_ADDR_MAPPED) {
+		struct net_device *dev = NULL;
 		int chk_addr_ret;
 
 		/* Binding to v4-mapped address on a v6-only socket
@@ -320,9 +321,17 @@  static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
 			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 */
 		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 (!inet_can_nonlocal_bind(net, inet) &&
 		    v4addr != htonl(INADDR_ANY) &&
 		    chk_addr_ret != RTN_LOCAL &&