LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enforce 4.14+ instead of program being present

Browse Source 
These two checks are theoretically equivalent,
since netd.o marks the program as requiring 4.14+.

Thus unless netd.o bpf program is broken, or bpfloader
is misbehaving, this change is a no-op.

Bug: 270276754
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2c6982e7476c2fa56b67532c80d97d7389030d32
This commit is contained in:
Maciej Żenczykowski
2023-02-22 22:09:25 +00:00
parent 752afc0974
commit 0309362cc9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netd/BpfHandler.cpp
View File

@@ -93,7 +93,7 @@ static Status initPrograms(const char* cg2_path) {
// cgroup if the program is pinned properly. // cgroup if the program is pinned properly.
// TODO: delete the if statement once all devices should support cgroup // TODO: delete the if statement once all devices should support cgroup
// socket filter (ie. the minimum kernel version required is 4.14). // 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( RETURN_IF_NOT_OK(
attachProgramToCgroup(CGROUP_SOCKET_PROG_PATH, cg_fd, BPF_CGROUP_INET_SOCK_CREATE)); attachProgramToCgroup(CGROUP_SOCKET_PROG_PATH, cg_fd, BPF_CGROUP_INET_SOCK_CREATE));
} }