diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-25 21:39:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-25 21:39:21 -0700 |
| commit | b79d1d54cf0672f764402fe4711ef5306f917bd3 (patch) | |
| tree | 44fb00ef8ed3b3dab2d4b0c37aa78531c551c861 /net | |
| parent | b54c9b98bbfb4836b1f7441c5a9db24affd3c2e9 (diff) | |
| download | linux-b79d1d54cf0672f764402fe4711ef5306f917bd3.tar.gz linux-b79d1d54cf0672f764402fe4711ef5306f917bd3.tar.bz2 linux-b79d1d54cf0672f764402fe4711ef5306f917bd3.zip | |
ipv6: Fix result generation in ipv6_get_ifaddr().
Finishing naturally from hlist_for_each_entry(x, ...) does not result
in 'x' being NULL.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 999568344721..21b4c9e1a682 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1341,9 +1341,9 @@ EXPORT_SYMBOL(ipv6_chk_prefix); struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr, struct net_device *dev, int strict) { - struct inet6_ifaddr *ifp = NULL; - struct hlist_node *node; + struct inet6_ifaddr *ifp, *result = NULL; unsigned int hash = ipv6_addr_hash(addr); + struct hlist_node *node; rcu_read_lock_bh(); hlist_for_each_entry_rcu(ifp, node, &inet6_addr_lst[hash], addr_lst) { @@ -1352,6 +1352,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add if (ipv6_addr_equal(&ifp->addr, addr)) { if (dev == NULL || ifp->idev->dev == dev || !(ifp->scope&(IFA_LINK|IFA_HOST) || strict)) { + result = ifp; in6_ifa_hold(ifp); break; } @@ -1359,7 +1360,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add } rcu_read_unlock_bh(); - return ifp; + return result; } /* Gets referenced address, destroys ifaddr */ |