bpf: fix end-of-list detection in cgroup_storage_get_next_key()
Subsystems (3)
v2 cover bpf: fix end-of-list detection in cgroup_storage_get_next_key()
list_next_entry() never returns NULL, so the NULL check in cgroup_storage_get_next_key() is dead code. When iterating past the last element, the function reads storage->key from a bogus pointer that aliases internal map fields and copies the result to userspace.
Patch 1 replaces the NULL check with list_entry_is_head() so the function correctly returns -ENOENT when there are no more entries.
Patch 2 adds a selftest to cover this corner case, as suggested by Sun Jian and Paul Chaignon.
v2:
- Added selftest (Paul Chaignon)
- Collected Reviewed-by and Acked-by tags
Weiming Shi (2):
bpf: fix end-of-list detection in cgroup_storage_get_next_key() selftests/bpf: add get_next_key boundary test for cgroup_storage
kernel/bpf/local_storage.c | 2 +- tools/testing/selftests/bpf/prog_tests/cgroup_storage.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
2.43.0
PATCH v2 1/2 bpf: fix end-of-list detection in cgroup_storage_get_next_key()
list_next_entry() never returns NULL -- when the current element is the last entry it wraps to the list head via container_of(). The subsequent NULL check is therefore dead code and get_next_key() never returns -ENOENT for the last element, instead reading storage->key from a bogus pointer that aliases internal map fields and copying the result to userspace.
Replace it with list_entry_is_head() so the function correctly returns -ENOENT when there are no more entries.
--- kernel/bpf/local_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/local_storage.c +1 -1
@@ -270,7 +270,7 @@ static int cgroup_storage_get_next_key(struct bpf_map *_map, void *key, goto enoent; storage =list_next_entry (storage, list_map); -if (!storage) +if (list_entry_is_head (storage, &map->list, list_map)) goto enoent; }else { storage = list_first_entry(&map->list,
Signature · 1 line
2.43.0
PATCH v2 2/2 selftests/bpf: add get_next_key boundary test for cgroup_storage
In reply to Weiming ShiVerify that bpf_map__get_next_key() correctly returns -ENOENT when called on the last (and only) key in a cgroup_storage map. Before the fix in the previous patch, this would succeed with bogus key data instead of failing.
--- tools/testing/selftests/bpf/prog_tests/cgroup_storage.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/testing/selftests/bpf/prog_tests/cgroup_storage.c +5 -0
@@ -86,6 +86,11 @@ void test_cgroup_storage(void) err =SYS_NOFAIL (PING_CMD );ASSERT_OK (err,"sixth ping" ); + err =bpf_map__get_next_key (skel->maps.cgroup_storage, &key, &key, +sizeof (key)); +ASSERT_ERR (err,"bpf_map__get_next_key should fail" ); +ASSERT_EQ (errno,ENOENT ,"no second key" ); + cleanup_progs:cgroup_storage__destroy (skel); cleanup_network:
Signature · 1 line
2.43.0
Re: [PATCH bpf v2 2/2] selftests/bpf: add get_next_key boundary test for cgroup_storage
Quoted 7 lines · Weiming Shi
Verify that
bpf_map__get_next_key()correctly returns-ENOENTwhen called on the last (and only) key in acgroup_storagemap. Before the fix in the previous patch, this would succeed with bogus key data instead of failing.Suggested-by Paul Chaignon <[email protected]>Signed-off-by Weiming Shi <[email protected]>
Quoted 23 lines
--- tools/testing/selftests/bpf/prog_tests/cgroup_storage.c | 5 +++++ 1 file changed, 5 insertions(+)tools/testing/selftests/bpf/prog_tests/cgroup_storage.c +5
-0@@ -86,6 +86,11 @@ void test_cgroup_storage(void) err =SYS_NOFAIL (PING_CMD );ASSERT_OK (err,"sixth ping" ); + err =bpf_map__get_next_key (skel->maps.cgroup_storage, &key, &key, +sizeof (key)); +ASSERT_ERR (err,"bpf_map__get_next_key should fail" ); +ASSERT_EQ (errno,ENOENT ,"no second key" ); + cleanup_progs:cgroup_storage__destroy (skel); cleanup_network:Signature · 1 line
2.43.0
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Fri, 3 Apr 2026 21:29:49 +0800 you wrote:
list_next_entry()never returns NULL, so the NULL check incgroup_storage_get_next_key()is dead code. When iterating past the last element, the function readsstorage->keyfrom a bogus pointer that aliases internal map fields and copies the result to userspace.Patch 1 replaces the NULL check with
list_entry_is_head()so the function correctly returns-ENOENTwhen there are no more entries.[...]
Here is the summary with links:
- [bpf,v2,1/2] bpf: fix end-of-list detection in cgroup_storage_get_next_key()
https://git.kernel.org/bpf/bpf-next/c/5828b9e5b272 - [bpf,v2,2/2] selftests/bpf: add get_next_key boundary test for cgroup_storage https://git.kernel.org/bpf/bpf-next/c/262b857da6be
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html