diff options
| -rw-r--r-- | elf/dl-load.c | 13 | ||||
| -rw-r--r-- | sysdeps/x86/dl-prop.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 1ed7a7bbd6..c1bc8c26be 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1015,8 +1015,8 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, else { phdr = alloca (maplength); - __lseek (fd, header->e_phoff, SEEK_SET); - if ((size_t) __read_nocancel (fd, (void *) phdr, maplength) != maplength) + if ((size_t) __pread64_nocancel (fd, (void *) phdr, maplength, + header->e_phoff) != maplength) { errstring = N_("cannot read file data"); goto call_lose_errno; @@ -1664,9 +1664,8 @@ open_verify (const char *name, int fd, else { phdr = alloca (maplength); - __lseek (fd, ehdr->e_phoff, SEEK_SET); - if ((size_t) __read_nocancel (fd, (void *) phdr, maplength) - != maplength) + if ((size_t) __pread64_nocancel (fd, (void *) phdr, maplength, + ehdr->e_phoff) != maplength) { read_error: errval = errno; @@ -1704,8 +1703,8 @@ open_verify (const char *name, int fd, abi_note = abi_note_malloced; } - __lseek (fd, ph->p_offset, SEEK_SET); - if (__read_nocancel (fd, (void *) abi_note, size) != size) + if (__pread64_nocancel (fd, (void *) abi_note, size, + ph->p_offset) != size) { free (abi_note_malloced); goto read_error; diff --git a/sysdeps/x86/dl-prop.h b/sysdeps/x86/dl-prop.h index a99eec11b9..fa5bd988ca 100644 --- a/sysdeps/x86/dl-prop.h +++ b/sysdeps/x86/dl-prop.h @@ -167,8 +167,7 @@ _dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph, note_malloced = malloc (size); note = note_malloced; } - __lseek (fd, ph->p_offset, SEEK_SET); - if (__read_nocancel (fd, (void *) note, size) != size) + if (__pread64_nocancel (fd, (void *) note, size, ph->p_offset) != size) { if (note_malloced) free (note_malloced); |