diff options
| author | Joe Simmons-Talbott <josimmon@redhat.com> | 2023-10-02 12:55:27 +0000 |
|---|---|---|
| committer | Joe Simmons-Talbott <josimmon@redhat.com> | 2023-10-02 12:55:27 +0000 |
| commit | 08e9a60a1ad34425a849c37611e55dd9fb4d3618 (patch) | |
| tree | 677e8aa5a4126a8f347992f89d0b96783e28a181 | |
| parent | d90b43a4ed475dac5b0cd6e01ceb35c7b0f7f2ff (diff) | |
| download | glibc-08e9a60a1ad34425a849c37611e55dd9fb4d3618.zip glibc-08e9a60a1ad34425a849c37611e55dd9fb4d3618.tar.gz glibc-08e9a60a1ad34425a849c37611e55dd9fb4d3618.tar.bz2 | |
mips: dl-machine-reject-phdr: Get rid of alloca.
Read directly into the mips_abiflags struct rather than reading the
entire segment and using alloca when the passed buffer is not big enough.
Checked with build-many-glibcs.py on mips-linux-gnu
Tested-by: Ying Huang <ying.huang@oss.cipunited.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | sysdeps/mips/dl-machine-reject-phdr.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/sysdeps/mips/dl-machine-reject-phdr.h b/sysdeps/mips/dl-machine-reject-phdr.h index 104b590..b784697 100644 --- a/sysdeps/mips/dl-machine-reject-phdr.h +++ b/sysdeps/mips/dl-machine-reject-phdr.h @@ -161,7 +161,7 @@ elf_machine_reject_phdr_p (const ElfW(Phdr) *phdr, unsigned int phnum, Lmid_t nsid; int in_abi = -1; struct abi_req in_req; - Elf_MIPS_ABIFlags_v0 *mips_abiflags = NULL; + Elf_MIPS_ABIFlags_v0 mips_abiflags; bool perfect_match = false; #if _MIPS_SIM == _ABIO32 unsigned int cur_mode = -1; @@ -176,25 +176,19 @@ elf_machine_reject_phdr_p (const ElfW(Phdr) *phdr, unsigned int phnum, /* Read the attributes section. */ if (ph != NULL) { - ElfW(Addr) size = ph->p_filesz; + ElfW(Addr) size = sizeof (Elf_MIPS_ABIFlags_v0); - if (ph->p_offset + size <= len) - mips_abiflags = (Elf_MIPS_ABIFlags_v0 *) (buf + ph->p_offset); - else - { - mips_abiflags = alloca (size); - __lseek (fd, ph->p_offset, SEEK_SET); - if (__libc_read (fd, (void *) mips_abiflags, size) != size) - REJECT (" unable to read PT_MIPS_ABIFLAGS\n"); - } - - if (size < sizeof (Elf_MIPS_ABIFlags_v0)) + if (ph->p_filesz < size) REJECT (" contains malformed PT_MIPS_ABIFLAGS\n"); - if (__glibc_unlikely (mips_abiflags->flags2 != 0)) - REJECT (" unknown MIPS.abiflags flags2: %u\n", mips_abiflags->flags2); + __lseek (fd, ph->p_offset, SEEK_SET); + if (__libc_read (fd, (void *) &mips_abiflags, size) != size) + REJECT (" unable to read PT_MIPS_ABIFLAGS\n"); + + if (__glibc_unlikely (mips_abiflags.flags2 != 0)) + REJECT (" unknown MIPS.abiflags flags2: %u\n", mips_abiflags.flags2); - in_abi = mips_abiflags->fp_abi; + in_abi = mips_abiflags.fp_abi; } /* ANY is compatible with anything. */ |