joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

bpf_helper: fix map assert

Browse source 
BPFLOADER_T_VERSION is not defined (and thus 0)

This was missed when BPFLOADER_*_VERSION was removed
as no longer needed (for non mainline versions) due
to not actually causing a compile error.

Restore it.  Android S kernels might not support writing
into non-zero index of bpf map arrays (due to kernel bug).

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I834d4a9f897ea1fa16435d8df709df8eeb69e7e8
This commit is contained in:
Maciej Żenczykowski 2025-07-29 23:06:33 -07:00
commit 74ca650020
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bpf/progs/include/bpf_helpers.h
View file

@ -329,7 +329,7 @@ static int (*bpf_sk_storage_delete_unsafe) (const void* sk_storage,
#ifdef THIS_BPF_PROGRAM_IS_FOR_TEST_PURPOSES_ONLY
#define BPF_MAP_ASSERT_OK(type, entries, mode)
#elif BPFLOADER_MIN_VER >= BPFLOADER_T_VERSION
#elif BPFLOADER_MIN_VER >= BPFLOADER_MAINLINE_T_VERSION
#define BPF_MAP_ASSERT_OK(type, entries, mode)
#else
#define BPF_MAP_ASSERT_OK(type, entries, mode) \