diff options
| author | David Ahern | 2019-01-05 16:35:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-26 09:32:33 +0100 |
| commit | c1fa98a5748fa8dc5291ada95360ddbe24977246 (patch) | |
| tree | 76049f16d080dc9917a58bffb7c415e4a7de1f7e /net/ipv6/af_inet6.c | |
| parent | r8169: Add support for new Realtek Ethernet (diff) | |
| download | kernel-qcow2-linux-c1fa98a5748fa8dc5291ada95360ddbe24977246.tar.gz kernel-qcow2-linux-c1fa98a5748fa8dc5291ada95360ddbe24977246.tar.xz kernel-qcow2-linux-c1fa98a5748fa8dc5291ada95360ddbe24977246.zip | |
ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses
[ Upstream commit d4a7e9bb74b5aaf07b89f6531c080b1130bdf019 ]
I realized the last patch calls dev_get_by_index_rcu in a branch not
holding the rcu lock. Add the calls to rcu_read_lock and rcu_read_unlock.
Fixes: ec90ad334986 ("ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address")
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 895847e57a8e..506b2ae07bb3 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -320,17 +320,20 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, goto out; } + rcu_read_lock(); if (sk->sk_bound_dev_if) { dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if); if (!dev) { err = -ENODEV; - goto out; + goto out_unlock; } } /* Reproduce AF_INET checks to make the bindings consistent */ v4addr = addr->sin6_addr.s6_addr32[3]; chk_addr_ret = inet_addr_type_dev_table(net, dev, v4addr); + rcu_read_unlock(); + if (!inet_can_nonlocal_bind(net, inet) && v4addr != htonl(INADDR_ANY) && chk_addr_ret != RTN_LOCAL && |