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

require a bpf program definition am: 5c79165bb2 am: 28a735510a am: 86f7c0b362 am: 11ba91e10c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2172788

Change-Id: I7469293105b361121f13989f5e307b9d3deb46fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2022-08-08 19:09:29 +00:00 committed by Automerger Merge Worker
commit 08e5ed863c
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
libbpf_android/Loader.cpp
View file

@ -995,33 +995,35 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
unsigned kvers = kernelVersion(); unsigned kvers = kernelVersion();
int ret, fd; int ret, fd;
if (!kvers) return -1; if (!kvers) {
ALOGE("unable to get kernel version");
return -EINVAL;
}
string objName = pathToObjName(string(elfPath)); string objName = pathToObjName(string(elfPath));
for (int i = 0; i < (int)cs.size(); i++) { for (int i = 0; i < (int)cs.size(); i++) {
string name = cs[i].name; string name = cs[i].name;
unsigned bpfMinVer = DEFAULT_BPFLOADER_MIN_VER; // v0.0
unsigned bpfMaxVer = DEFAULT_BPFLOADER_MAX_VER; // v1.0
domain selinux_context = domain::unspecified;
domain pin_subdir = domain::unspecified;
if (cs[i].prog_def.has_value()) { if (!cs[i].prog_def.has_value()) {
unsigned min_kver = cs[i].prog_def->min_kver; ALOGE("[%d] '%s' missing program definition! bad bpf.o build?", i, name.c_str());
unsigned max_kver = cs[i].prog_def->max_kver; return -EINVAL;
ALOGD("cs[%d].name:%s min_kver:%x .max_kver:%x (kvers:%x)", i, name.c_str(), min_kver,
max_kver, kvers);
if (kvers < min_kver) continue;
if (kvers >= max_kver) continue;
bpfMinVer = cs[i].prog_def->bpfloader_min_ver;
bpfMaxVer = cs[i].prog_def->bpfloader_max_ver;
selinux_context = getDomainFromSelinuxContext(cs[i].prog_def->selinux_context);
pin_subdir = getDomainFromPinSubdir(cs[i].prog_def->pin_subdir);
// Note: make sure to only check for unrecognized *after* verifying bpfloader
// version limits include this bpfloader's version.
} }
unsigned min_kver = cs[i].prog_def->min_kver;
unsigned max_kver = cs[i].prog_def->max_kver;
ALOGD("cs[%d].name:%s min_kver:%x .max_kver:%x (kvers:%x)", i, name.c_str(), min_kver,
max_kver, kvers);
if (kvers < min_kver) continue;
if (kvers >= max_kver) continue;
unsigned bpfMinVer = cs[i].prog_def->bpfloader_min_ver;
unsigned bpfMaxVer = cs[i].prog_def->bpfloader_max_ver;
domain selinux_context = getDomainFromSelinuxContext(cs[i].prog_def->selinux_context);
domain pin_subdir = getDomainFromPinSubdir(cs[i].prog_def->pin_subdir);
// Note: make sure to only check for unrecognized *after* verifying bpfloader
// version limits include this bpfloader's version.
ALOGD("cs[%d].name:%s requires bpfloader version [0x%05x,0x%05x)", i, name.c_str(), ALOGD("cs[%d].name:%s requires bpfloader version [0x%05x,0x%05x)", i, name.c_str(),
bpfMinVer, bpfMaxVer); bpfMinVer, bpfMaxVer);
if (BPFLOADER_VERSION < bpfMinVer) continue; if (BPFLOADER_VERSION < bpfMinVer) continue;
@ -1089,7 +1091,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
for (const auto& line : lines) ALOGW("%s", line.c_str()); for (const auto& line : lines) ALOGW("%s", line.c_str());
ALOGW("bpf_prog_load - END log_buf contents."); ALOGW("bpf_prog_load - END log_buf contents.");
if (cs[i].prog_def.has_value() && cs[i].prog_def->optional) { if (cs[i].prog_def->optional) {
ALOGW("failed program is marked optional - continuing..."); ALOGW("failed program is marked optional - continuing...");
continue; continue;
} }
@ -1130,14 +1132,12 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
ALOGE("chmod %s 0440 -> [%d:%s]", progPinLoc.c_str(), err, strerror(err)); ALOGE("chmod %s 0440 -> [%d:%s]", progPinLoc.c_str(), err, strerror(err));
return -err; return -err;
} }
if (cs[i].prog_def.has_value()) { if (chown(progPinLoc.c_str(), (uid_t)cs[i].prog_def->uid,
if (chown(progPinLoc.c_str(), (uid_t)cs[i].prog_def->uid, (gid_t)cs[i].prog_def->gid)) {
(gid_t)cs[i].prog_def->gid)) { int err = errno;
int err = errno; ALOGE("chown %s %d %d -> [%d:%s]", progPinLoc.c_str(), cs[i].prog_def->uid,
ALOGE("chown %s %d %d -> [%d:%s]", progPinLoc.c_str(), cs[i].prog_def->uid, cs[i].prog_def->gid, err, strerror(err));
cs[i].prog_def->gid, err, strerror(err)); return -err;
return -err;
}
} }
} }