diff options
| author |   Andrey Ryabinin <aryabinin@virtuozzo.com> | 2015-12-21 12:54:45 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-22 15:57:54 -0500 |
| commit | e459dfeeb64008b2d23bdf600f03b3605dbb8152 (patch) | |
| tree | d0f1c4b878c279acc8f9b77effa174145fbed999 /net/ipv6/addrlabel.c | |
| parent | switchdev: bridge: Pass ageing time as clock_t instead of jiffies (diff) | |
| download | linux-dev-e459dfeeb64008b2d23bdf600f03b3605dbb8152.tar.xz linux-dev-e459dfeeb64008b2d23bdf600f03b3605dbb8152.zip | |
ipv6/addrlabel: fix ip6addrlbl_get()
ip6addrlbl_get() has never worked. If ip6addrlbl_hold() succeeded,
ip6addrlbl_get() will exit with '-ESRCH'. If ip6addrlbl_hold() failed,
ip6addrlbl_get() will use about to be free ip6addrlbl_entry pointer.
Fix this by inverting ip6addrlbl_hold() check.
Fixes: 2a8cc6c89039 ("[IPV6] ADDRCONF: Support RFC3484 configurable address selection policy table.")
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrlabel.c')
| -rw-r--r-- | net/ipv6/addrlabel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index 882124ebb438..a8f6986dcbe5 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c @@ -552,7 +552,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh) rcu_read_lock(); p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal->ifal_index); - if (p && ip6addrlbl_hold(p)) + if (p && !ip6addrlbl_hold(p)) p = NULL; lseq = ip6addrlbl_table.seq; rcu_read_unlock(); |