bpf: hash map: decrement counter on error
Decrement the number of elements in the map in case the allocation
of a new node fails.
Fixes: 6c90598174
("bpf: pre-allocate hash map elements")
Signed-off-by: Mauricio Vasquez B <mauricio.vasquez@polito.it>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
parent
39d393cf20
commit
ed2b82c03d
|
@ -747,13 +747,15 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
|
||||||
* old element will be freed immediately.
|
* old element will be freed immediately.
|
||||||
* Otherwise return an error
|
* Otherwise return an error
|
||||||
*/
|
*/
|
||||||
atomic_dec(&htab->count);
|
l_new = ERR_PTR(-E2BIG);
|
||||||
return ERR_PTR(-E2BIG);
|
goto dec_count;
|
||||||
}
|
}
|
||||||
l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,
|
l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,
|
||||||
htab->map.numa_node);
|
htab->map.numa_node);
|
||||||
if (!l_new)
|
if (!l_new) {
|
||||||
return ERR_PTR(-ENOMEM);
|
l_new = ERR_PTR(-ENOMEM);
|
||||||
|
goto dec_count;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(l_new->key, key, key_size);
|
memcpy(l_new->key, key, key_size);
|
||||||
|
@ -766,7 +768,8 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
|
||||||
GFP_ATOMIC | __GFP_NOWARN);
|
GFP_ATOMIC | __GFP_NOWARN);
|
||||||
if (!pptr) {
|
if (!pptr) {
|
||||||
kfree(l_new);
|
kfree(l_new);
|
||||||
return ERR_PTR(-ENOMEM);
|
l_new = ERR_PTR(-ENOMEM);
|
||||||
|
goto dec_count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -780,6 +783,9 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,
|
||||||
|
|
||||||
l_new->hash = hash;
|
l_new->hash = hash;
|
||||||
return l_new;
|
return l_new;
|
||||||
|
dec_count:
|
||||||
|
atomic_dec(&htab->count);
|
||||||
|
return l_new;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old,
|
static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old,
|
||||||
|
|
Loading…
Reference in New Issue