commit d2b8991b2755652fd0251a35efdee414523956b6
author Maciej Żenczykowski <maze@google.com> Thu Mar 02 01:48:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 02 01:48:00 2023 +0000
tree b406d78e62a0d7190ea2262505b103af1f620544
parent 2a89cc44ffb86d96a1d54fb9c71d1cd97cc6a1b1
parent 0309362cc92c8184d84d4da3070417cbf6ab43e2

Merge "enforce 4.14+ instead of program being present"

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 7950ff7..2b773c9 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -93,7 +93,7 @@
     // cgroup if the program is pinned properly.
     // TODO: delete the if statement once all devices should support cgroup
     // socket filter (ie. the minimum kernel version required is 4.14).
-    if (!access(CGROUP_SOCKET_PROG_PATH, F_OK)) {
+    if (bpf::isAtLeastKernelVersion(4, 14, 0)) {
         RETURN_IF_NOT_OK(
                 attachProgramToCgroup(CGROUP_SOCKET_PROG_PATH, cg_fd, BPF_CGROUP_INET_SOCK_CREATE));
     }