From eb831a8f3bd3295a1a4fee934873b380972fa8a3 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 6 Dec 2022 18:31:12 -0500 Subject: [PATCH] system/bpf: Add patch to fix boot on legacy devices with kernel bug --- ...ability-to-write-to-index-0-of-bpf-m.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 system/bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch diff --git a/system/bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch b/system/bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch new file mode 100644 index 0000000..8704b6d --- /dev/null +++ b/system/bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch @@ -0,0 +1,34 @@ +From cf04b02d96fef364996067ca4ecc51b65f521dca Mon Sep 17 00:00:00 2001 +From: Peter Cai +Date: Tue, 6 Dec 2022 18:30:32 -0500 +Subject: [PATCH] Revert "detect inability to write to index != 0 of bpf map + array" + +This reverts commit ead9d83423877458023056f6ccf9390950d6726f. +--- + bpfloader/BpfLoader.cpp | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp +index 5cd80b7..bc72811 100644 +--- a/bpfloader/BpfLoader.cpp ++++ b/bpfloader/BpfLoader.cpp +@@ -199,15 +199,6 @@ int main(int argc, char** argv) { + } + } + +- int key = 1; +- int value = 123; +- android::base::unique_fd map( +- android::bpf::createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0)); +- if (android::bpf::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 (android::base::SetProperty("bpf.progs_loaded", "1") == false) { + ALOGE("Failed to set bpf.progs_loaded property"); + return 1; +-- +2.38.1 +