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

Merge "BpfHandler: add 25Q2+ netd map create and write test" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-01-30 16:11:15 -08:00 • committed by Gerrit Code Review
commit 6825d9fa3e
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bpf/netd/BpfHandler.cpp
View file

@ -274,6 +274,16 @@ Status BpfHandler::init(const char* cg2_path) {
RETURN_IF_NOT_OK(initPrograms(cg2_path));
RETURN_IF_NOT_OK(initMaps());
if (android_get_device_api_level() > __ANDROID_API_V__) {
// make sure netd can create & write maps. sepolicy is V+, but enough to enforce on 25Q2+
int key = 1;
int value = 123;
unique_fd map(bpf::createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0));
if (!map.ok()) return statusFromErrno(errno, fmt::format("map create failed"));
int rv = bpf::writeToMapEntry(map, &key, &value, BPF_ANY);
if (rv) return statusFromErrno(errno, fmt::format("map write failed (rv={})", rv));
}
return netdutils::status::ok;
}