diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-07-30 11:56:40 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-07-30 11:56:40 +0000 |
| commit | ee84495193e2dd1b7afc925247e0e351281aa943 (patch) | |
| tree | 1c87e8f0da0682408321706189845bc58e3a7c68 /sys | |
| parent | 9717091adc4d7f24c0355f3a88db812db08714d3 (diff) | |
Make the e_phnum check slightly cleaner.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/exec_elf64.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/kern/exec_elf64.c b/sys/kern/exec_elf64.c index 1a8d8a2f5ed..aeb86f5ccd3 100644 --- a/sys/kern/exec_elf64.c +++ b/sys/kern/exec_elf64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf64.c,v 1.16 2001/07/09 18:55:21 millert Exp $ */ +/* $OpenBSD: exec_elf64.c,v 1.17 2001/07/30 11:56:39 art Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -199,6 +199,9 @@ elf64_check_header(ehdr, type) if (ehdr->e_type != type) return (ENOEXEC); + if (ehdr->e_phnum > 128) + return (ENOEXEC); + return (0); } @@ -242,6 +245,10 @@ os_ok: if (ehdr->e_type != type) return (ENOEXEC); + /* Don't allow an insane amount of sections. */ + if (ehdr->e_phnum > 128) + return (ENOEXEC); + *os = ehdr->e_ident[OI_OS]; return (0); } @@ -399,11 +406,6 @@ elf64_load_file(p, path, epp, ap, last) } phsize = eh.e_phnum * sizeof(Elf64_Phdr); - if (phsize > 8192) { - /* XXX - this is not the way we want to fix this, but ... */ - error = EINVAL; - goto bad1; - } ph = (Elf64_Phdr *)malloc(phsize, M_TEMP, M_WAITOK); if ((error = elf64_read_from(p, nd.ni_vp, eh.e_phoff, (caddr_t)ph, @@ -792,10 +794,6 @@ elf64_os_pt_note(p, epp, eh, os_name, name_size, desc_size) int error; phsize = eh->e_phnum * sizeof(Elf64_Phdr); - if (phsize > 8192) { - /* XXX - this is not the way we want to fix this, but ... */ - return EINVAL; - } hph = (Elf64_Phdr *)malloc(phsize, M_TEMP, M_WAITOK); if ((error = elf64_read_from(p, epp->ep_vp, eh->e_phoff, (caddr_t)hph, phsize)) != 0) |