commit eaa799625004228b58c710745ccebbe58fe6f26c
author Pierre-Hugues Husson <phh@phh.me> Wed Oct 26 18:10:04 2022 -0400
committer Jis G Jacob <studiokeys@blissroms.org> Sat May 04 13:55:40 2024 -0400
tree 6b89f82a5fc6547047557c9589c7a8b98071563d
parent 0b7472237889c6b4ca901d54079a03a7b26397e8

Allow failing to load bpf programs, for BPF-less devices

Change-Id: I68ba3be2e15c188e56e32a6ecf844e1ca64d560f
Signed-off-by: Dmitrii <bankersenator@gmail.com>
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 2252e07..b833352 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -115,8 +115,14 @@
     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_DENYLIST_PROG_PATH));
     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_EGRESS_PROG_PATH));
     RETURN_IF_NOT_OK(checkProgramAccessible(XT_BPF_INGRESS_PROG_PATH));
-    RETURN_IF_NOT_OK(attachProgramToCgroup(BPF_EGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_EGRESS));
-    RETURN_IF_NOT_OK(attachProgramToCgroup(BPF_INGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_INGRESS));
+    auto ret = attachProgramToCgroup(BPF_EGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_EGRESS);
+    if (!isOk(ret)) {
+        ALOGE("Failed loading egress program");
+    }
+    auto ret2 = attachProgramToCgroup(BPF_INGRESS_PROG_PATH, cg_fd, BPF_CGROUP_INET_INGRESS);
+    if (!isOk(ret)) {
+        ALOGE("Failed loading ingress program");
+    }
 
     // For the devices that support cgroup socket filter, the socket filter
     // should be loaded successfully by bpfloader. So we attach the filter to