diff --git a/bpf/netd/Android.bp b/bpf/netd/Android.bp index fe4d999303..473c8c9429 100644 --- a/bpf/netd/Android.bp +++ b/bpf/netd/Android.bp @@ -82,7 +82,6 @@ cc_test { "libcutils", "liblog", "libnetdutils", - "libprocessgroup", ], compile_multilib: "both", multilib: { diff --git a/bpf/netd/BpfBaseTest.cpp b/bpf/netd/BpfBaseTest.cpp index 34dfbb4db7..4b8a04e944 100644 --- a/bpf/netd/BpfBaseTest.cpp +++ b/bpf/netd/BpfBaseTest.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -54,13 +53,6 @@ class BpfBasicTest : public NetNativeTestBase { BpfBasicTest() {} }; -TEST_F(BpfBasicTest, TestCgroupMounted) { - std::string cg2_path; - ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_HIERARCHY_NAME, &cg2_path)); - ASSERT_EQ(0, access(cg2_path.c_str(), R_OK)); - ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK)); -} - TEST_F(BpfBasicTest, TestTagSocket) { BpfMap cookieTagMap(COOKIE_TAG_MAP_PATH); ASSERT_TRUE(cookieTagMap.isValid()); diff --git a/bpf/netd/BpfHandler.cpp b/bpf/netd/BpfHandler.cpp index 50e03299c1..340acda0ad 100644 --- a/bpf/netd/BpfHandler.cpp +++ b/bpf/netd/BpfHandler.cpp @@ -97,6 +97,7 @@ static Status initPrograms(const char* cg2_path) { 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));