tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Snap for 8303774 from 58950886d8 to tm-release

Browse source 
Change-Id: I0e574ab5d96e2ec87170d795bad1f435176891df
This commit is contained in:
Android Build Coastguard Worker 2022-03-16 01:09:52 +00:00
commit bc9cfd8d5a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bpfloader/BpfLoader.cpp
View file

@ -58,7 +58,7 @@ using std::string;
// attachment of programs to shared resources (or to detect when a shared resource
// has one BPF program replace another that is attached there)
constexpr bpf_prog_type kVendorAllowedProgTypes[] = {
BPF_PROG_TYPE_TRACEPOINT,
BPF_PROG_TYPE_SOCKET_FILTER,
};
struct Location {

4
libbpf_android/Loader.cpp
View file

@ -32,7 +32,7 @@
// This is BpfLoader v0.10
#define BPFLOADER_VERSION_MAJOR 0u
#define BPFLOADER_VERSION_MINOR 10u
#define BPFLOADER_VERSION_MINOR 11u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h"
@ -881,13 +881,13 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
if (!reuse) {
ret = bpf_obj_pin(fd, progPinLoc.c_str());
if (ret) return -errno;
if (chmod(progPinLoc.c_str(), 0440)) return -errno;
if (cs[i].prog_def.has_value()) {
if (chown(progPinLoc.c_str(), (uid_t)cs[i].prog_def->uid,
(gid_t)cs[i].prog_def->gid)) {
return -errno;
}
}
if (chmod(progPinLoc.c_str(), 0440)) return -errno;
}
cs[i].prog_fd.reset(fd);