[PATCH] binfmt_elf: Safely increment argv pointers

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Kees Cook <keescook@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH] binfmt_elf: Safely increment argv pointers
Date	Thu, 22 Jun 2017 19:40:02 +0200
Message-ID	<tVefg-7PJ-5@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=0FVYDIuHXVgUN53dIjPPToBhQC7Jyw/gtn9FZ8UzwKg=; b=FvtVwE6S+Toa9O7QcdYsL7nWYugdUZMK7daI9Wj32zEsznuof8dDs9ngrN2TFDsig1 M8wstZjqIX722CRn0emZOCG1odu1XWmqKqnC0HPZq0bx/KVoCBui+ni03HOYw1nWOcDu mjZHx24O3ms0EqF8CSwcG27n703DU2bnhxSrg=
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=0FVYDIuHXVgUN53dIjPPToBhQC7Jyw/gtn9FZ8UzwKg=; b=AA8CYLJ3JdDoYz5TRpS2Rn8XxKr4DMxbuHj7b/gj3nF0sQ3sgxfdsRseQu+wcCH4LG uadWUnGXgeOVyrKOSqg5XFDM6lPA6gwiCybIFkFa7CiygEDu+ZxvWnTa9hbK6DEW6xwX wXA6pQirOiVM5GsXs6QZ/PtZwvpQFa60hbO8HLp2koWR67QeB5YqRBHSQTO9HsAq5KYj hQ0MkW1EQF3+ngcOl7rJ+5VBMVTTQV88dOAFLkAMT9uG/Hkndoi/H8fmTEH+lBH050/W s/BxruZJGLHgxZR7XSk2MYGdyYd1Y4nmbWaxslchyfSG0DBEouksSOU+5iOBaXwdLJjo t38Q==
X-Gm-Message-State	AKS2vOxtQ7Wq718uiqIqu6K0b5tKwXkWXYiNaCrWC2MC1X04c7u9Mje2 lrhxyaRvl6cW3ShD
X-Received	by 10.98.106.66 with SMTP id f63mr3843726pfc.169.1498153120313; Thu, 22 Jun 2017 10:38:40 -0700 (PDT)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	80
Organization	linux.* mail to news gateway
X-Original-Cc	Rik van Riel <riel@redhat.com>, Daniel Micay <danielmicay@gmail.com>, Qualys Security Advisory <qsa@qualys.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org, Alexander Viro <viro@zeniv.linux.org.uk>, Dmitry Safonov <dsafonov@virtuozzo.com>, Andy Lutomirski <luto@amacapital.net>, Grzegorz Andrejczuk <grzegorz.andrejczuk@intel.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, kernel-hardening@lists.openwall.com
X-Original-Date	Thu, 22 Jun 2017 10:38:38 -0700
X-Original-Message-ID	<20170622173838.GA43308@beast>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1672908

Show key headers only | View raw

When building the argv/envp pointers, the envp is needlessly
pre-incremented instead of just continuing after the argv pointers are
finished. In some (likely impossible) race where the strings could
be changed from userspace between copy_strings() and here, it might
be possible to confuse the envp position. Instead, just use sp like
everything else.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 fs/binfmt_elf.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 7465c3ea5dd5..879ff9c7ffd0 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -163,8 +163,6 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
 	unsigned long p = bprm->p;
 	int argc = bprm->argc;
 	int envc = bprm->envc;
-	elf_addr_t __user *argv;
-	elf_addr_t __user *envp;
 	elf_addr_t __user *sp;
 	elf_addr_t __user *u_platform;
 	elf_addr_t __user *u_base_platform;
@@ -304,38 +302,38 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
 	/* Now, let's put argc (and argv, envp if appropriate) on the stack */
 	if (__put_user(argc, sp++))
 		return -EFAULT;
-	argv = sp;
-	envp = argv + argc + 1;
 
-	/* Populate argv and envp */
+	/* Populate list of argv pointers back to argv strings. */
 	p = current->mm->arg_end = current->mm->arg_start;
 	while (argc-- > 0) {
 		size_t len;
-		if (__put_user((elf_addr_t)p, argv++))
+		if (__put_user((elf_addr_t)p, sp++))
 			return -EFAULT;
 		len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);
 		if (!len || len > MAX_ARG_STRLEN)
 			return -EINVAL;
 		p += len;
 	}
-	if (__put_user(0, argv))
+	if (__put_user(0, sp++))
 		return -EFAULT;
-	current->mm->arg_end = current->mm->env_start = p;
+	current->mm->arg_end = p;
+
+	/* Populate list of envp pointers back to envp strings. */
+	current->mm->env_end = current->mm->env_start = p;
 	while (envc-- > 0) {
 		size_t len;
-		if (__put_user((elf_addr_t)p, envp++))
+		if (__put_user((elf_addr_t)p, sp++))
 			return -EFAULT;
 		len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);
 		if (!len || len > MAX_ARG_STRLEN)
 			return -EINVAL;
 		p += len;
 	}
-	if (__put_user(0, envp))
+	if (__put_user(0, sp++))
 		return -EFAULT;
 	current->mm->env_end = p;
 
 	/* Put the elf_info on the stack in the right place.  */
-	sp = (elf_addr_t __user *)envp + 1;
 	if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
 		return -EFAULT;
 	return 0;
-- 
2.7.4


-- 
Kees Cook
Pixel Security

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] binfmt_elf: Safely increment argv pointers Kees Cook <keescook@chromium.org> - 2017-06-22 19:40 +0200

csiph-web