From patchwork Tue Jul 18 22:25:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9849967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5F65600CC for ; Tue, 18 Jul 2017 22:28:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F90828433 for ; Tue, 18 Jul 2017 22:28:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93CA7285B7; Tue, 18 Jul 2017 22:28:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2583028433 for ; Tue, 18 Jul 2017 22:28:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbdGRW12 (ORCPT ); Tue, 18 Jul 2017 18:27:28 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:33611 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752659AbdGRWZw (ORCPT ); Tue, 18 Jul 2017 18:25:52 -0400 Received: by mail-pg0-f54.google.com with SMTP id k14so19995833pgr.0 for ; Tue, 18 Jul 2017 15:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dph8SJLzmHE12iqggtj1aNOD4jNaPrzZvU2fKfKk/JE=; b=N59K3YACUH8MnJZlW5BUvGNjL1nQ5KwAGaavX7hX+RNy/GAbLuIZkcy2k8RjQPni91 N2q8KgVcAtiE+1Xki5QstSiB6Va8Q5Co8X/rwCdEGuNCKPe5YilhGN+5C4XZ2effRBmQ XZ9A5BlPITknOXGjMjExDjJbnt9Ah0UIBmgRY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dph8SJLzmHE12iqggtj1aNOD4jNaPrzZvU2fKfKk/JE=; b=BSuCqUbM5ORkiUOEYj5OVfDrgn5X1l7TP6j06MaUxRUI/0Zntu9N6JaZPynFzVgRhe j6eBglPqYnb7pBJv4SplvcUEbqaG5rnhC5sldH6QqG9LEo3S4tzooh6wyYsIK7B0YAxS /hgWpf0evhPkLoIwQW0Y7bQdQuhtIK8YZIq/jkCivIBwyJFf1y4/3xKAacu01P5hZSBf K8JycpJbJSTAVIZyyd7UNkG2i2lHHieQsU86F0Hlvo+FtwnWvV9VNfgeZjnE2dm0DW+V WrkkLLm3BaLxvRcNijqNph+UDX3NK0VMguNTcfQMyFa+43UsqFVAN5NsEuQHf65lBvOL 4bMQ== X-Gm-Message-State: AIVw110xdJ0VIOWBZQsEHhoVDAsiLJRS397ewYGURX29Echcvk9etIuj RbVQX/eBm4O5AooM X-Received: by 10.99.104.3 with SMTP id d3mr3868971pgc.278.1500416752142; Tue, 18 Jul 2017 15:25:52 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id b24sm6524042pfh.53.2017.07.18.15.25.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 15:25:47 -0700 (PDT) From: Kees Cook To: Andrew Morton Cc: Kees Cook , David Howells , "Eric W . Biederman" , John Johansen , "Serge E. Hallyn" , Paul Moore , Stephen Smalley , Casey Schaufler , Tetsuo Handa , James Morris , Andy Lutomirski , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 09/15] exec: Correct comments about "point of no return" Date: Tue, 18 Jul 2017 15:25:30 -0700 Message-Id: <1500416736-49829-10-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500416736-49829-1-git-send-email-keescook@chromium.org> References: <1500416736-49829-1-git-send-email-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In commit 221af7f87b97 ("Split 'flush_old_exec' into two functions"), the comment about the point of no return should have stayed in flush_old_exec() since it refers to "bprm->mm = NULL;" line, but prior changes in commits c89681ed7d0e ("remove steal_locks()"), and fd8328be874f ("sanitize handling of shared descriptor tables in failing execve()") made it look like it meant the current->sas_ss_sp line instead. The comment was referring to the fact that once bprm->mm is NULL, all failures from a binfmt load_binary hook (e.g. load_elf_binary), will get SEGV raised against current. Move this comment and expand the explanation a bit, putting it above the assignment this time, and add details about the true nature of "point of no return" being the call to flush_old_exec() itself. This also removes an erroneous commet about when credentials are being installed. That has its own dedicated function, install_exec_creds(), which carries a similar (and correct) comment, so remove the bogus comment where installation is not actually happening. Cc: David Howells Cc: Eric W. Biederman Signed-off-by: Kees Cook Acked-by: "Eric W. Biederman" --- fs/exec.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 53ffa739fb58..f9480d3e0b82 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1258,6 +1258,12 @@ void __set_task_comm(struct task_struct *tsk, const char *buf, bool exec) perf_event_comm(tsk, exec); } +/* + * Calling this is the point of no return. None of the failures will be + * seen by userspace since either the process is already taking a fatal + * signal (via de_thread() or coredump), or will have SEGV raised + * (after exec_mmap()) by search_binary_handlers (see below). + */ int flush_old_exec(struct linux_binprm * bprm) { int retval; @@ -1285,7 +1291,13 @@ int flush_old_exec(struct linux_binprm * bprm) if (retval) goto out; - bprm->mm = NULL; /* We're using it now */ + /* + * After clearing bprm->mm (to mark that current is using the + * prepared mm now), we have nothing left of the original + * process. If anything from here on returns an error, the check + * in search_binary_handler() will SEGV current. + */ + bprm->mm = NULL; set_fs(USER_DS); current->flags &= ~(PF_RANDOMIZE | PF_FORKNOEXEC | PF_KTHREAD | @@ -1339,7 +1351,6 @@ void setup_new_exec(struct linux_binprm * bprm) arch_pick_mmap_layout(current->mm); - /* This is the point of no return */ current->sas_ss_sp = current->sas_ss_size = 0; if (uid_eq(current_euid(), current_uid()) && gid_eq(current_egid(), current_gid())) @@ -1357,7 +1368,6 @@ void setup_new_exec(struct linux_binprm * bprm) */ current->mm->task_size = TASK_SIZE; - /* install the new credentials */ if (!uid_eq(bprm->cred->uid, current_euid()) || !gid_eq(bprm->cred->gid, current_egid())) { current->pdeath_signal = 0;