| Message ID | 20201104000930.155577-1-jbakita@cs.unc.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | binfmt_elf: Fix regression limiting ELF program header size | expand |
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 2472af2798c7..55162056590f 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -412,15 +412,11 @@ static struct elf_phdr *load_elf_phdrs(struct elfhdr *elf_ex, /* Sanity check the number of program headers... */ if (elf_ex->e_phnum < 1 || elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr)) goto out; - /* ...and their total size. */ size = sizeof(struct elf_phdr) * elf_ex->e_phnum; - if (size > ELF_MIN_ALIGN) - goto out; - elf_phdata = kmalloc(size, GFP_KERNEL); if (!elf_phdata) goto out; /* Read in the program headers */
Commit 6a8d38945cf4 ("binfmt_elf: Hoist ELF program header loading to a function") merged load_elf_binary and load_elf_interp into load_elf_phdrs. This change imposed a limit that the program headers of all ELF binaries are smaller than ELF_MIN_ALIGN. This is a mistake for two reasons: 1. load_elf_binary previously had no such constraint, meaning that previously valid ELF program headers are now rejected by the kernel as oversize and invalid. 2. The ELF interpreter's program headers should never have been limited to ELF_MIN_ALIGN (and previously PAGE_SIZE) in the first place. Commit 057f54fbba73 ("Import 1.1.54") introduced this limit to the ELF interpreter alongside the initial ELF parsing support without any explanation. This patch removes the ELF_MIN_ALIGN size constraint in favor of only relying on an earlier check that the allocation will be less than 64KiB. (It's worth mentioning that the 64KiB limit is also unnecessarily strict, but that's not addressed here for simplicity. The ELF manpage says that the program header size is supposed to have at most 64 thousand entries, not less than 64 thousand bytes.) Fixes: 6a8d38945cf4 ("binfmt_elf: Hoist ELF program header loading to a function") Signed-off-by: Joshua Bakita <jbakita@cs.unc.edu> --- fs/binfmt_elf.c | 4 ---- 1 file changed, 4 deletions(-)