fs/exec.c: account for argv/envp pointers 12/155112/1
authorKees Cook <keescook@chromium.org>
Fri, 23 Jun 2017 22:08:57 +0000 (15:08 -0700)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 12 Oct 2017 05:57:51 +0000 (14:57 +0900)
commitda466768ba74e51d1618105b13ac4e53371a6a52
tree90e154675973a7e270d60b532a238303ddfceb3d
parentf0e0e3b1f94f68b1efc9bc94c3d9eb2d7bca4f1f
fs/exec.c: account for argv/envp pointers

commit 98da7d08850fb8bdeb395d6368ed15753304aa0c upstream.

When limiting the argv/envp strings during exec to 1/4 of the stack limit,
the storage of the pointers to the strings was not included.  This means
that an exec with huge numbers of tiny strings could eat 1/4 of the stack
limit in strings and then additional space would be later used by the
pointers to the strings.

For example, on 32-bit with a 8MB stack rlimit, an exec with 1677721
single-byte strings would consume less than 2MB of stack, the max (8MB /
4) amount allowed, but the pointers to the strings would consume the
remaining additional stack space (1677721 * 4 == 6710884).

The result (1677721 + 6710884 == 8388605) would exhaust stack space
entirely.  Controlling this stack exhaustion could result in
pathological behavior in setuid binaries (CVE-2017-1000365).

[akpm@linux-foundation.org: additional commenting from Kees]
Fixes: b6a2fea39318 ("mm: variable length argument support")
Link: http://lkml.kernel.org/r/20170622001720.GA32173@beast
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Rik van Riel <riel@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Qualys Security Advisory <qsa@qualys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.16: use ACCESS_ONCE() instead of READ_ONCE()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[sw0312.kim: cherry-pick from linux-3.16.y to fix CVE-2017-1000365]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I03c3deb7901a485ef76453b91450b860a968983c
fs/exec.c