]> git.itanic.dy.fi Git - linux-stable/commit
bpf: fix a memory leak in the LRU and LRU_PERCPU hash maps
authorAnton Protopopov <aspsk@isovalent.com>
Mon, 22 May 2023 15:45:58 +0000 (15:45 +0000)
committerMartin KaFai Lau <martin.lau@kernel.org>
Mon, 22 May 2023 17:26:39 +0000 (10:26 -0700)
commitb34ffb0c6d23583830f9327864b9c1f486003305
treec628f2bc7f4f6c1a0399fdb94ec897357b41444a
parent0613d8ca9ab382caabe9ed2dceb429e9781e443f
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: 20b6cc34ea74 ("bpf: Avoid hashtab deadlock with map_locked")
Signed-off-by: Anton Protopopov <aspsk@isovalent.com>
Link: https://lore.kernel.org/r/20230522154558.2166815-1-aspsk@isovalent.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
kernel/bpf/hashtab.c