Commit 10b19249 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Kees Cook

ELF: fix overflow in total mapping size calculation

Kernel assumes that ELF program headers are ordered by mapping address,
but doesn't enforce it. It is possible to make mapping size extremely huge
by simply shuffling first and last PT_LOAD segments.

As long as PT_LOAD segments do not overlap, it is silly to require
sorting by v_addr anyway because mmap() doesn't care.

Don't assume PT_LOAD segments are sorted and calculate min and max
addresses correctly.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Tested-by: default avatar"Magnus Groß" <magnus.gross@rwth-aachen.de>
Link: https://lore.kernel.org/all/Yfqm7HbucDjPbES+@fractal.localdomain/Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/lkml/YVmd7D0M6G%2FDcP4O@localhost.localdomain
parent 439a8468
...@@ -93,7 +93,7 @@ static int elf_core_dump(struct coredump_params *cprm); ...@@ -93,7 +93,7 @@ static int elf_core_dump(struct coredump_params *cprm);
#define ELF_CORE_EFLAGS 0 #define ELF_CORE_EFLAGS 0
#endif #endif
#define ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(ELF_MIN_ALIGN-1)) #define ELF_PAGESTART(_v) ((_v) & ~(int)(ELF_MIN_ALIGN-1))
#define ELF_PAGEOFFSET(_v) ((_v) & (ELF_MIN_ALIGN-1)) #define ELF_PAGEOFFSET(_v) ((_v) & (ELF_MIN_ALIGN-1))
#define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1)) #define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1))
...@@ -399,22 +399,21 @@ static unsigned long elf_map(struct file *filep, unsigned long addr, ...@@ -399,22 +399,21 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
return(map_addr); return(map_addr);
} }
static unsigned long total_mapping_size(const struct elf_phdr *cmds, int nr) static unsigned long total_mapping_size(const struct elf_phdr *phdr, int nr)
{ {
int i, first_idx = -1, last_idx = -1; elf_addr_t min_addr = -1;
elf_addr_t max_addr = 0;
bool pt_load = false;
int i;
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
if (cmds[i].p_type == PT_LOAD) { if (phdr[i].p_type == PT_LOAD) {
last_idx = i; min_addr = min(min_addr, ELF_PAGESTART(phdr[i].p_vaddr));
if (first_idx == -1) max_addr = max(max_addr, phdr[i].p_vaddr + phdr[i].p_memsz);
first_idx = i; pt_load = true;
} }
} }
if (first_idx == -1) return pt_load ? (max_addr - min_addr) : 0;
return 0;
return cmds[last_idx].p_vaddr + cmds[last_idx].p_memsz -
ELF_PAGESTART(cmds[first_idx].p_vaddr);
} }
static int elf_read(struct file *file, void *buf, size_t len, loff_t pos) static int elf_read(struct file *file, void *buf, size_t len, loff_t pos)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment