commit | eb85ea5f2a7bc1e65c08966a58d1fdce3c80fe07 | [log] [tgz] |
---|---|---|
author | Maciej Żenczykowski <maze@google.com> | Wed Nov 20 19:32:07 2024 +0000 |
committer | Maciej Żenczykowski <maze@google.com> | Wed Nov 20 19:38:11 2024 +0000 |
tree | d52de76860d70d95b0ab0a09822da79104fe3f4b | |
parent | c58cfb7c7da257010346bd2d6dcca1c0acdc8321 [diff] [blame] |
Remove BpfBaseTest processgroup test. In practice this has to pass already due to netd_updatable init attaching BPF_CGROUP_INET_{E,IN}GRESS programs. This allows removing the processgroup shared lib dependency, which should allow switching it from C to C++ mangling. Thus we might be able to revert the revert (ie. reapply): https://android-review.googlesource.com/c/platform/system/core/+/3366140 in https://android-review.googlesource.com/c/platform/system/core/+/3369297 Test: TreeHugger Bug: 379796721 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I865d6705e4a6477d428261ef182173df1f5b4672
diff --git a/bpf/netd/BpfHandler.cpp b/bpf/netd/BpfHandler.cpp index 50e0329..340acda 100644 --- a/bpf/netd/BpfHandler.cpp +++ b/bpf/netd/BpfHandler.cpp
@@ -97,6 +97,7 @@ ALOGE("Failed to open the cgroup directory: %s", strerror(err)); return statusFromErrno(err, "Open the cgroup directory failed"); } + RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_ALLOWLIST_PROG_PATH)); RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_DENYLIST_PROG_PATH)); RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_EGRESS_PROG_PATH));