mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

ipv6: no more dev_put() in datagram_send_ctl()

Browse source 
Avoids touching device refcount in datagram_send_ctl(), thanks to RCU

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-11-02 12:21:06 +01:00 committed by David S. Miller
parent 16ba5e8e7c
commit 536b2e92f1
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/ipv6/datagram.c
View file

@ -537,12 +537,17 @@ int datagram_send_ctl(struct net *net,
addr_type = __ipv6_addr_type(&src_info->ipi6_addr); addr_type = __ipv6_addr_type(&src_info->ipi6_addr);
rcu_read_lock();
if (fl->oif) { if (fl->oif) {
dev = dev_get_by_index(net, fl->oif); dev = dev_get_by_index_rcu(net, fl->oif);
if (!dev) if (!dev) {
rcu_read_unlock();
return -ENODEV; return -ENODEV;
} else if (addr_type & IPV6_ADDR_LINKLOCAL) }
} else if (addr_type & IPV6_ADDR_LINKLOCAL) {
rcu_read_unlock();
return -EINVAL; return -EINVAL;
}
if (addr_type != IPV6_ADDR_ANY) { if (addr_type != IPV6_ADDR_ANY) {
int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL; int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL;
@ -553,8 +558,7 @@ int datagram_send_ctl(struct net *net,
ipv6_addr_copy(&fl->fl6_src, &src_info->ipi6_addr); ipv6_addr_copy(&fl->fl6_src, &src_info->ipi6_addr);
} }
if (dev) rcu_read_unlock();
dev_put(dev);
if (err) if (err)
goto exit_f; goto exit_f;