netfilter: ipset: Fix hash type expire: release empty hash bucket block
When all entries are expired/all slots are empty, release the bucket. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
This commit is contained in:
parent
e9dfdc052d
commit
0aae24eb40
|
@ -476,7 +476,7 @@ static void
|
|||
mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize)
|
||||
{
|
||||
struct htable *t;
|
||||
struct hbucket *n;
|
||||
struct hbucket *n, *tmp;
|
||||
struct mtype_elem *data;
|
||||
u32 i, j, d;
|
||||
#ifdef IP_SET_HASH_WITH_NETS
|
||||
|
@ -511,7 +511,12 @@ mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize)
|
|||
}
|
||||
}
|
||||
if (d >= AHASH_INIT_SIZE) {
|
||||
struct hbucket *tmp = kzalloc(sizeof(*tmp) +
|
||||
if (d >= n->size) {
|
||||
rcu_assign_pointer(hbucket(t, i), NULL);
|
||||
kfree_rcu(n, rcu);
|
||||
continue;
|
||||
}
|
||||
tmp = kzalloc(sizeof(*tmp) +
|
||||
(n->size - AHASH_INIT_SIZE) * dsize,
|
||||
GFP_ATOMIC);
|
||||
if (!tmp)
|
||||
|
|
Loading…
Reference in New Issue