From b3ddc8afad264aa9af94905fba9d14886801cbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 2 Apr 2025 17:52:39 -0700 Subject: [PATCH] NetBpfLoad: don't fail on S on kernels with buggy bpf arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 404427531 Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: Ib30a731d7faecfc7e52590e28350c3289fe26852 --- bpf/loader/NetBpfLoad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 74c37c4519..2d8f783365 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1913,7 +1913,7 @@ static int doLoad(char** argv, char * const envp[]) { createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0)); if (writeToMapEntry(map, &key, &value, BPF_ANY)) { ALOGE("Critical kernel bug - failure to write into index 1 of 2 element bpf map array."); - return 1; + if (isAtLeastT) return 1; } // on S we haven't created this subdir yet, but we need it for 'mainline_done' flag below