lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: no more dev_put() in inet6_bind()

Browse Source 
Avoids touching device refcount in inet6_bind(), 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:10:39 +01:00
committed by David S. Miller
parent f1a28eab20
commit 16ba5e8e7c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/ipv6/af_inet6.c
View File

@@ -314,6 +314,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if (addr_type != IPV6_ADDR_ANY) { if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL; struct net_device *dev = NULL;
rcu_read_lock();
if (addr_type & IPV6_ADDR_LINKLOCAL) { if (addr_type & IPV6_ADDR_LINKLOCAL) {
if (addr_len >= sizeof(struct sockaddr_in6) && if (addr_len >= sizeof(struct sockaddr_in6) &&
addr->sin6_scope_id) { addr->sin6_scope_id) {
@@ -326,12 +327,12 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
/* Binding to link-local address requires an interface */ /* Binding to link-local address requires an interface */
if (!sk->sk_bound_dev_if) { if (!sk->sk_bound_dev_if) {
err = -EINVAL; err = -EINVAL;
goto out; goto out_unlock;
} }
dev = dev_get_by_index(net, sk->sk_bound_dev_if); dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
if (!dev) { if (!dev) {
err = -ENODEV; err = -ENODEV;
goto out; goto out_unlock;
} }
} }
@@ -342,14 +343,11 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if (!(addr_type & IPV6_ADDR_MULTICAST)) { if (!(addr_type & IPV6_ADDR_MULTICAST)) {
if (!ipv6_chk_addr(net, &addr->sin6_addr, if (!ipv6_chk_addr(net, &addr->sin6_addr,
dev, 0)) { dev, 0)) {
if (dev)
dev_put(dev);
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto out; goto out_unlock;
} }
} }
if (dev) rcu_read_unlock();
dev_put(dev);
} }
} }
@@ -381,6 +379,9 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
out: out:
release_sock(sk); release_sock(sk);
return err; return err;
out_unlock:
rcu_read_unlock();
goto out;
} }
EXPORT_SYMBOL(inet6_bind); EXPORT_SYMBOL(inet6_bind);