diff options
| author | Andrey Ryabinin <aryabinin@virtuozzo.com> | 2015-12-21 12:54:45 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:41 +0800 |
| commit | 2c165804da934f079f43f3e6731b9c018b3cf583 (patch) | |
| tree | ed0da494973112d4690234db1a60c0d332a5c409 | |
| parent | 5244151ef795a4d00b4fdb261a3bf68beb202246 (diff) | |
| download | linux-stable-2c165804da934f079f43f3e6731b9c018b3cf583.tar.gz linux-stable-2c165804da934f079f43f3e6731b9c018b3cf583.tar.bz2 linux-stable-2c165804da934f079f43f3e6731b9c018b3cf583.zip | |
ipv6/addrlabel: fix ip6addrlbl_get()
commit e459dfeeb64008b2d23bdf600f03b3605dbb8152 upstream.
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>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -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 2d8ddba9ee58..c8c6a121298b 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c @@ -558,7 +558,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(); |