diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-01-04 16:58:15 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-04 17:18:58 -0800 |
| commit | ec90ad334986fa5856d11dd272f7f22fa86c55c4 (patch) | |
| tree | d0dd9fdcda98b593123ddc60dc72855835adfc4b /net | |
| parent | ixgbe: fix Kconfig when driver is not a module (diff) | |
| download | linux-dev-ec90ad334986fa5856d11dd272f7f22fa86c55c4.tar.xz linux-dev-ec90ad334986fa5856d11dd272f7f22fa86c55c4.zip | |
ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/af_inet6.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 0bfb6cc0a30a..93288b9f1697 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 && |