From: Kees Cook Date: Fri, 7 Jul 2017 18:57:29 +0000 (-0700) Subject: exec: Limit arg stack to at most 75% of _STK_LIM X-Git-Tag: v4.1.12-124.31.3~519 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acadafcd9b015413f5236b8d7c9e256fa839a938;p=users%2Fjedix%2Flinux-maple.git exec: Limit arg stack to at most 75% of _STK_LIM Orabug: 28709994 CVE: CVE-2018-14634 To avoid pathological stack usage or the need to special-case setuid execs, just limit all arg stack usage to at most 75% of _STK_LIM (6MB). Signed-off-by: Kees Cook Signed-off-by: Linus Torvalds (cherry picked from commit da029c11e6b12f321f36dac8771e833b65cec962) Signed-off-by: Brian Maly Reviewed-by: Jack Vogel --- diff --git a/fs/exec.c b/fs/exec.c index 9139f5a3c545..c0320e086ea0 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -207,8 +207,7 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, if (write) { unsigned long size = bprm->vma->vm_end - bprm->vma->vm_start; - unsigned long ptr_size; - struct rlimit *rlim; + unsigned long ptr_size, limit; /* * Since the stack will hold pointers to the strings, we @@ -237,14 +236,16 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, return page; /* - * Limit to 1/4-th the stack size for the argv+env strings. + * Limit to 1/4 of the max stack size or 3/4 of _STK_LIM + * (whichever is smaller) for the argv+env strings. * This ensures that: * - the remaining binfmt code will not run out of stack space, * - the program will have a reasonable amount of stack left * to work from. */ - rlim = current->signal->rlim; - if (size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur) / 4) + limit = _STK_LIM / 4 * 3; + limit = min(limit, rlimit(RLIMIT_STACK) / 4); + if (size > limit) goto fail; }