joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

NetBpfLoad: Update helper methods to use borrowed_fd

Browse source 
Bug: 428792764
Flag: EXEMPT no-op
Test: TH
Change-Id: I8e29fcbda75ec4c2fa6f2bb5dbd9da6cd44ed9c4
This commit is contained in:
Motomu Utsumi 2025-07-25 10:41:53 +09:00
commit 52a3ba7f16
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bpf/loader/NetBpfLoad.cpp
View file

@ -68,6 +68,7 @@
#define BPFLOADER_MAINLINE_S_VERSION 42u
#define BPFLOADER_MAINLINE_25Q2_VERSION 47u
using android::base::borrowed_fd;
using android::base::EndsWith;
using android::base::GetIntProperty;
using android::base::GetProperty;
@ -870,7 +871,7 @@ static bool isBtfSupported(enum bpf_map_type type) {
return type != BPF_MAP_TYPE_DEVMAP_HASH && type != BPF_MAP_TYPE_RINGBUF;
}
static int pinMap(const unique_fd& fd, const string& mapName, const struct bpf_map_def& mapDef,
static int pinMap(const borrowed_fd& fd, const string& mapName, const struct bpf_map_def& mapDef,
const string& objName, const string& mapPinLoc) {
int ret;
domain selinux_context = getDomainFromSelinuxContext(mapDef.selinux_context);
@ -1187,7 +1188,7 @@ static void applyMapRelo(ifstream& elfFile, vector<unique_fd> &mapFds, vector<co
}
}
static int pinProg(const unique_fd& fd, string& name, struct bpf_prog_def& progDef,
static int pinProg(const borrowed_fd& fd, string& name, struct bpf_prog_def& progDef,
const string& objName, string& progPinLoc) {
int ret;
domain selinux_context = getDomainFromSelinuxContext(progDef.selinux_context);
@ -1234,7 +1235,8 @@ static int pinProg(const unique_fd& fd, string& name, struct bpf_prog_def& progD
return 0;
}
static int validateProg(unique_fd& fd, string& progPinLoc, const unsigned int bpfloader_ver) {
static int validateProg(const borrowed_fd& fd, string& progPinLoc,
const unsigned int bpfloader_ver) {
if (!isAtLeastKernelVersion(4, 14, 0)) {
return 0;
}