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

bpfloader: use non-overwriting rename am: e15229f055 am: cbe811c65e am: 28434ab400

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

Change-Id: I20a316c611bcfbc08c0a18242c5ed96ef69efc2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2023-04-17 20:53:40 +00:00 committed by Automerger Merge Worker
commit be340c2120
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libbpf_android/Loader.cpp
View file

@ -17,6 +17,7 @@
#define LOG_TAG "LibBpfLoader" #define LOG_TAG "LibBpfLoader"
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <log/log.h> #include <log/log.h>
@ -901,7 +902,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
ALOGE("create %s -> %d [%d:%s]", createLoc.c_str(), ret, err, strerror(err)); ALOGE("create %s -> %d [%d:%s]", createLoc.c_str(), ret, err, strerror(err));
return -err; return -err;
} }
ret = rename(createLoc.c_str(), mapPinLoc.c_str()); ret = renameat2(AT_FDCWD, createLoc.c_str(),
AT_FDCWD, mapPinLoc.c_str(), RENAME_NOREPLACE);
if (ret) { if (ret) {
int err = errno; int err = errno;
ALOGE("rename %s %s -> %d [%d:%s]", createLoc.c_str(), mapPinLoc.c_str(), ret, ALOGE("rename %s %s -> %d [%d:%s]", createLoc.c_str(), mapPinLoc.c_str(), ret,
@ -1153,7 +1155,8 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
ALOGE("create %s -> %d [%d:%s]", createLoc.c_str(), ret, err, strerror(err)); ALOGE("create %s -> %d [%d:%s]", createLoc.c_str(), ret, err, strerror(err));
return -err; return -err;
} }
ret = rename(createLoc.c_str(), progPinLoc.c_str()); ret = renameat2(AT_FDCWD, createLoc.c_str(),
AT_FDCWD, progPinLoc.c_str(), RENAME_NOREPLACE);
if (ret) { if (ret) {
int err = errno; int err = errno;
ALOGE("rename %s %s -> %d [%d:%s]", createLoc.c_str(), progPinLoc.c_str(), ret, ALOGE("rename %s %s -> %d [%d:%s]", createLoc.c_str(), progPinLoc.c_str(), ret,