Skip to content

Commit

Permalink
RDMA/addr: Use appropriate locking with for_each_netdev()
Browse files Browse the repository at this point in the history
for_each_netdev() should be used with RTNL or dev_base_lock held,
or else we risk a crash.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Eric Dumazet authored and Roland Dreier committed Nov 18, 2009
1 parent a7ca1f0 commit 0f9ea5d
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/infiniband/core/addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
case AF_INET6:
read_lock(&dev_base_lock);
for_each_netdev(&init_net, dev) {
if (ipv6_chk_addr(&init_net,
&((struct sockaddr_in6 *) addr)->sin6_addr,
Expand All @@ -139,6 +140,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
break;
}
}
read_unlock(&dev_base_lock);
break;
#endif
}
Expand Down Expand Up @@ -391,14 +393,17 @@ static int addr_resolve_local(struct sockaddr *src_in,
{
struct in6_addr *a;

read_lock(&dev_base_lock);
for_each_netdev(&init_net, dev)
if (ipv6_chk_addr(&init_net,
&((struct sockaddr_in6 *) dst_in)->sin6_addr,
dev, 1))
break;

if (!dev)
if (!dev) {
read_unlock(&dev_base_lock);
return -EADDRNOTAVAIL;
}

a = &((struct sockaddr_in6 *) src_in)->sin6_addr;

Expand All @@ -416,6 +421,7 @@ static int addr_resolve_local(struct sockaddr *src_in,
if (!ret)
memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
}
read_unlock(&dev_base_lock);
break;
}
#endif
Expand Down

0 comments on commit 0f9ea5d

Please sign in to comment.