diff options
| author | David Ahern | 2019-01-05 01:58:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-26 09:32:32 +0100 |
| commit | 9b25d7b69d6163551ad31c957e4f1a8f00c44daf (patch) | |
| tree | f89093594f2d76a5236a658ba23d2d7a0d53ae6c /net/ipv6/af_inet6.c | |
| parent | Linux 4.19.17 (diff) | |
| download | kernel-qcow2-linux-9b25d7b69d6163551ad31c957e4f1a8f00c44daf.tar.gz kernel-qcow2-linux-9b25d7b69d6163551ad31c957e4f1a8f00c44daf.tar.xz kernel-qcow2-linux-9b25d7b69d6163551ad31c957e4f1a8f00c44daf.zip | |
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: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -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 9a4261e50272..895847e57a8e 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -309,6 +309,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 @@ -319,9 +320,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 && |