ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libbacktrace: check if elf file paths are valid before reading them."

Browse source
This commit is contained in:
Yabin Cui 2015-12-09 18:26:15 +00:00 • committed by Gerrit Code Review
commit b6345d6efa
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libbacktrace/BacktraceOffline.cpp
View file

@ -22,7 +22,9 @@ extern "C" {
} }
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <ucontext.h> #include <ucontext.h>
#include <unistd.h> #include <unistd.h>
@ -616,7 +618,30 @@ DebugFrameInfo* ReadDebugFrameFromELFFile(const llvm::object::ELFFile<ELFT>* elf
return debug_frame; return debug_frame;
} }
static bool IsValidElfPath(const std::string& filename) {
static const char elf_magic[] = {0x7f, 'E', 'L', 'F'};
struct stat st;
if (stat(filename.c_str(), &st) != 0 || !S_ISREG(st.st_mode)) {
return false;
}
FILE* fp = fopen(filename.c_str(), "reb");
if (fp == nullptr) {
return false;
}
char buf[4];
if (fread(buf, 4, 1, fp) != 1) {
fclose(fp);
return false;
}
fclose(fp);
return memcmp(buf, elf_magic, 4) == 0;
}
static DebugFrameInfo* ReadDebugFrameFromFile(const std::string& filename) { static DebugFrameInfo* ReadDebugFrameFromFile(const std::string& filename) {
if (!IsValidElfPath(filename)) {
return nullptr;
}
auto owning_binary = llvm::object::createBinary(llvm::StringRef(filename)); auto owning_binary = llvm::object::createBinary(llvm::StringRef(filename));
if (owning_binary.getError()) { if (owning_binary.getError()) {
return nullptr; return nullptr;