Commit c1fa98a5 authored Jan 05, 2019 by David Ahern Committed by Greg Kroah-Hartman Jan 26, 2019

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>

parent 19ad57e2

net/ipv6/af_inet6.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 &&