提交 55b80503 编写于 作者: E Eric Dumazet 提交者: David S. Miller

net: Fix IP_MULTICAST_IF

ipv4/ipv6 setsockopt(IP_MULTICAST_IF) have dubious __dev_get_by_index() calls.

This function should be called only with RTNL or dev_base_lock held, or reader
could see a corrupt hash chain and eventually enter an endless loop.

Fix is to call dev_get_by_index()/dev_put().

If this happens to be performance critical, we could define a new dev_exist_by_index()
function to avoid touching dev refcount.
Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 45054dc1
...@@ -634,17 +634,16 @@ static int do_ip_setsockopt(struct sock *sk, int level, ...@@ -634,17 +634,16 @@ static int do_ip_setsockopt(struct sock *sk, int level,
break; break;
} }
dev = ip_dev_find(sock_net(sk), mreq.imr_address.s_addr); dev = ip_dev_find(sock_net(sk), mreq.imr_address.s_addr);
if (dev) { if (dev)
mreq.imr_ifindex = dev->ifindex; mreq.imr_ifindex = dev->ifindex;
dev_put(dev);
}
} else } else
dev = __dev_get_by_index(sock_net(sk), mreq.imr_ifindex); dev = dev_get_by_index(sock_net(sk), mreq.imr_ifindex);
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
if (!dev) if (!dev)
break; break;
dev_put(dev);
err = -EINVAL; err = -EINVAL;
if (sk->sk_bound_dev_if && if (sk->sk_bound_dev_if &&
......
...@@ -496,13 +496,17 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, ...@@ -496,13 +496,17 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
goto e_inval; goto e_inval;
if (val) { if (val) {
struct net_device *dev;
if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != val) if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != val)
goto e_inval; goto e_inval;
if (__dev_get_by_index(net, val) == NULL) { dev = dev_get_by_index(net, val);
if (!dev) {
retv = -ENODEV; retv = -ENODEV;
break; break;
} }
dev_put(dev);
} }
np->mcast_oif = val; np->mcast_oif = val;
retv = 0; retv = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册