evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: ipset: list:set: fix reference counter update

Browse source 
The last element can be replaced or pushed off and in both
cases the reference counter must be updated.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Jozsef Kadlecsik 2013-04-09 08:57:19 +00:00 • committed by Pablo Neira Ayuso
parent 3a7b21eaf4
commit 02f815cb6d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/netfilter/ipset/ip_set_list_set.c
View file

@ -174,9 +174,13 @@ list_set_add(struct list_set *map, u32 i, ip_set_id_t id,
{ {
const struct set_elem *e = list_set_elem(map, i); const struct set_elem *e = list_set_elem(map, i);
if (i == map->size - 1 && e->id != IPSET_INVALID_ID) if (e->id != IPSET_INVALID_ID) {
/* Last element replaced: e.g. add new,before,last */ const struct set_elem *x = list_set_elem(map, map->size - 1);
ip_set_put_byindex(e->id);
/* Last element replaced or pushed off */
if (x->id != IPSET_INVALID_ID)
ip_set_put_byindex(x->id);
}
if (with_timeout(map->timeout)) if (with_timeout(map->timeout))
list_elem_tadd(map, i, id, ip_set_timeout_set(timeout)); list_elem_tadd(map, i, id, ip_set_timeout_set(timeout));
else else