generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename library_offset to library_fd_offset

Browse Source 
replace lseek() and use pread() instead
 add test for library_fd_offset > file_size case

Bug: 17762003

(cherry picked from commit a6c1279098)

Change-Id: Ie117c745081ee33d07db5341115ff6c8e98b0dec
This commit is contained in:
Dmitriy Ivanov
2014-10-21 12:09:18 -07:00
parent 3c5c720b0b
commit 702ab5b37e
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
linker/linker_phdr.cpp
View File

@@ -142,18 +142,12 @@ bool ElfReader::Load(const android_dlextinfo* extinfo) {
}
bool ElfReader::ReadElfHeader() {
off64_t actual_offset = lseek64(fd_, file_offset_, SEEK_SET);
if (actual_offset != file_offset_) {
DL_ERR("seek to %" PRId64 " failed: %s", file_offset_, strerror(errno));
return false;
}
ssize_t rc = TEMP_FAILURE_RETRY(read(fd_, &header_, sizeof(header_)));
ssize_t rc = TEMP_FAILURE_RETRY(pread64(fd_, &header_, sizeof(header_), file_offset_));
if (rc < 0) {
DL_ERR("can't read file \"%s\": %s", name_, strerror(errno));
return false;
}
if (rc != sizeof(header_)) {
DL_ERR("\"%s\" is too small to be an ELF executable: only found %zd bytes", name_,
static_cast<size_t>(rc));