| commit | a0e055492e96f03ebee515a3e97de0409ebbfcd8 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Sun Aug 30 20:10:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 30 20:10:12 2020 +0000 |
| tree | f189f6d4ab2a125b22c1c2f8e54bbe59903f0abd | |
| parent | c0487fd576980f2c26232e93a6a706b0784219f0 [diff] | |
| parent | 558482bfbfc17046e55bdf1ce506382af0443bdf [diff] |
[automerger skipped] Fix OOB read in DNS resolver am: 11ad8ac8e1 am: 5ecea437ef -s ours am: 0de09ea0ca am: 558482bfbf Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/12325645 Change-Id: I6fffd7fd6b1093262ccd50f0b0f3948c1d35b8e3
diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp index f28c5f8..f5d989e 100644 --- a/tests/bpf_base_test.cpp +++ b/tests/bpf_base_test.cpp
@@ -66,7 +66,7 @@ #else ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, nullptr)); // Constant derived from //system/core/libprocessgroup/profiles/cgroups.json - cg2_path = "/dev/cg2_bpf"; + cg2_path = "/sys/fs/cgroup"; #endif ASSERT_EQ(0, access(cg2_path.c_str(), R_OK)); ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));