diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-02 12:21:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-02 03:42:41 -0800 |
| commit | 536b2e92f1b7a86e177aeced097e4c051eeebe7d (patch) | |
| tree | 4630684ca8119dfcfd6e0ba87666dd193b4b6615 /net | |
| parent | 16ba5e8e7c01d2da87ff1d17e83545f164665b5c (diff) | |
| download | linux-3.10-536b2e92f1b7a86e177aeced097e4c051eeebe7d.tar.gz linux-3.10-536b2e92f1b7a86e177aeced097e4c051eeebe7d.tar.bz2 linux-3.10-536b2e92f1b7a86e177aeced097e4c051eeebe7d.zip | |
ipv6: no more dev_put() in datagram_send_ctl()
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/datagram.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 9f70452a69e..e6f9cdf780f 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -537,12 +537,17 @@ int datagram_send_ctl(struct net *net, addr_type = __ipv6_addr_type(&src_info->ipi6_addr); + rcu_read_lock(); if (fl->oif) { - dev = dev_get_by_index(net, fl->oif); - if (!dev) + dev = dev_get_by_index_rcu(net, fl->oif); + if (!dev) { + rcu_read_unlock(); return -ENODEV; - } else if (addr_type & IPV6_ADDR_LINKLOCAL) + } + } else if (addr_type & IPV6_ADDR_LINKLOCAL) { + rcu_read_unlock(); return -EINVAL; + } if (addr_type != IPV6_ADDR_ANY) { 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); } - if (dev) - dev_put(dev); + rcu_read_unlock(); if (err) goto exit_f; |