diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2010-11-15 20:29:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-22 07:37:36 -0800 |
| commit | 88b2a9a3d98a19496d64aadda7158c0ad51cbe7d (patch) | |
| tree | 6e2fef13c006956efb6f592356d1c06874baf34c /net/ipv6 | |
| parent | ddab1a3b30452bf6d2a2780dbb5fd962a85bec48 (diff) | |
| download | op-kernel-dev-88b2a9a3d98a19496d64aadda7158c0ad51cbe7d.zip op-kernel-dev-88b2a9a3d98a19496d64aadda7158c0ad51cbe7d.tar.gz | |
ipv6: fix missing in6_ifa_put in addrconf
Fix ref count bug introduced by
commit 2de795707294972f6c34bae9de713e502c431296
Author: Lorenzo Colitti <lorenzo@google.com>
Date: Wed Oct 27 18:16:49 2010 +0000
ipv6: addrconf: don't remove address state on ifdown if the address
is being kept
Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr
refcnt correctly with in6_ifa_put().
Reported-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 2fc35b3..23cc8e1 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2758,13 +2758,13 @@ static int addrconf_ifdown(struct net_device *dev, int how) ifa->state = INET6_IFADDR_STATE_DEAD; spin_unlock_bh(&ifa->state_lock); - if (state == INET6_IFADDR_STATE_DEAD) { - in6_ifa_put(ifa); - } else { + if (state != INET6_IFADDR_STATE_DEAD) { __ipv6_ifa_notify(RTM_DELADDR, ifa); atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifa); } + + in6_ifa_put(ifa); write_lock_bh(&idev->lock); } } |
