AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-25 04:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

mips: dl-machine-reject-phdr: Get rid of alloca.

Browse Source 
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>
This commit is contained in:
Joe Simmons-Talbott 2023-10-02 12:55:27 +00:00
parent d90b43a4ed
commit 08e9a60a1a
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sysdeps/mips/dl-machine-reject-phdr.h
View File

@ -161,7 +161,7 @@ elf_machine_reject_phdr_p (const ElfW(Phdr) *phdr, unsigned int phnum,
Lmid_t nsid; Lmid_t nsid;
int in_abi = -1; int in_abi = -1;
struct abi_req in_req; struct abi_req in_req;
Elf_MIPS_ABIFlags_v0 *mips_abiflags = NULL; Elf_MIPS_ABIFlags_v0 mips_abiflags;
bool perfect_match = false; bool perfect_match = false;
#if _MIPS_SIM == _ABIO32 #if _MIPS_SIM == _ABIO32
unsigned int cur_mode = -1; 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. */ /* Read the attributes section. */
if (ph != NULL) if (ph != NULL)
{ {
ElfW(Addr) size = ph->p_filesz; ElfW(Addr) size = sizeof (Elf_MIPS_ABIFlags_v0);
if (ph->p_offset + size <= len) if (ph->p_filesz < size)
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))
REJECT (" contains malformed PT_MIPS_ABIFLAGS\n"); REJECT (" contains malformed PT_MIPS_ABIFLAGS\n");
if (__glibc_unlikely (mips_abiflags->flags2 != 0)) __lseek (fd, ph->p_offset, SEEK_SET);
REJECT (" unknown MIPS.abiflags flags2: %u\n", mips_abiflags->flags2); if (__libc_read (fd, (void *) &mips_abiflags, size) != size)
REJECT (" unable to read PT_MIPS_ABIFLAGS\n");
in_abi = mips_abiflags->fp_abi; if (__glibc_unlikely (mips_abiflags.flags2 != 0))
REJECT (" unknown MIPS.abiflags flags2: %u\n", mips_abiflags.flags2);
in_abi = mips_abiflags.fp_abi;
} }
/* ANY is compatible with anything. */ /* ANY is compatible with anything. */