Commit b34ffb0c authored by Anton Protopopov's avatar Anton Protopopov Committed by Martin KaFai Lau
Browse files

bpf: fix a memory leak in the LRU and LRU_PERCPU hash maps 



The LRU and LRU_PERCPU maps allocate a new element on update before locking the
target hash table bucket. Right after that the maps try to lock the bucket.
If this fails, then maps return -EBUSY to the caller without releasing the
allocated element. This makes the element untracked: it doesn't belong to
either of free lists, and it doesn't belong to the hash table, so can't be
re-used; this eventually leads to the permanent -ENOMEM on LRU map updates,
which is unexpected. Fix this by returning the element to the local free list
if bucket locking fails.

Fixes: 20b6cc34 ("bpf: Avoid hashtab deadlock with map_locked")
Signed-off-by: default avatarAnton Protopopov <aspsk@isovalent.com>
Link: https://lore.kernel.org/r/20230522154558.2166815-1-aspsk@isovalent.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 0613d8ca

kernel/bpf/hashtab.c

+4 −2
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ static long htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value 


	ret = htab_lock_bucket(htab, b, hash, &flags);

	if (ret)

		return ret;

		goto err_lock_bucket;



	l_old = lookup_elem_raw(head, hash, key, key_size);
@@ -1236,6 +1236,7 @@ static long htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value 
err:

	htab_unlock_bucket(htab, b, hash, flags);



err_lock_bucket:

	if (ret)

		htab_lru_push_free(htab, l_new);

	else if (l_old)
@@ -1338,7 +1339,7 @@ static long __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key, 


	ret = htab_lock_bucket(htab, b, hash, &flags);

	if (ret)

		return ret;

		goto err_lock_bucket;



	l_old = lookup_elem_raw(head, hash, key, key_size);
@@ -1361,6 +1362,7 @@ static long __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key, 
	ret = 0;

err:

	htab_unlock_bucket(htab, b, hash, flags);

err_lock_bucket:

	if (l_new)

		bpf_lru_push_free(&htab->lru, &l_new->lru_node);

	return ret;