From patchwork Tue Aug 1 19:16:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9875351 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 2D39D60365 for ; Tue, 1 Aug 2017 19:21:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EA162872F for ; Tue, 1 Aug 2017 19:21:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1380D28736; Tue, 1 Aug 2017 19:21:11 +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=ham 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 73A9D2872F for ; Tue, 1 Aug 2017 19:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752034AbdHATVH (ORCPT ); Tue, 1 Aug 2017 15:21:07 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:36372 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752060AbdHATQo (ORCPT ); Tue, 1 Aug 2017 15:16:44 -0400 Received: by mail-pg0-f47.google.com with SMTP id v77so5941005pgb.3 for ; Tue, 01 Aug 2017 12:16:44 -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=MQ8wsSjjOG5MyN1PcFnk0XB719obeXg3SF+ZN6ykDgE=; b=c9ln3Yhyoxv3zbBkzanYcYtI6ZiPzoD/tLlSzBrCwpe2zIJVl9LIQcXN2O6l1cljCM YojVw6LcfQLrp+K2KIKQoYPVTuv5NYYnDq0FqSoY6RAlkT603URBC2V9OTZ4IJqvF0Yj QSOTnexFBCmN2FKArUgVVozwFLufT5UIwdalY= 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=MQ8wsSjjOG5MyN1PcFnk0XB719obeXg3SF+ZN6ykDgE=; b=UkHk8346ciBv69mPV5vUfvF+v7lyf2A5wp/bqjAebLzb9h6y3ZxkD7DrJccfMCBZqc xTpREggs71wb5uM46skdq+vzYSX/Bchhr2E3wS2/mcMxNKG6nuDa81vuZk+iJzroUmpz 26ni/aPDX2PSrj1/w2BlwwmyJiQ7dCYY7xYYeSMMNduUq4FbJHra7itxt6S1mlu55we2 etHWJ2cJfvQo9paoUIs5oKbL2kl5XlYc17qWnTHTw0PCKXDQlVcBbf/NpicUFBMVbql6 TKP41O0DQJMvz2+5O96EEZrqLTmiE2XZkopJYH/rNbC//VZVNIwbt7nBUELYJJkbDWcq TKaA== X-Gm-Message-State: AIVw1134+Dghzp7EdZNo6tUW+vp3Nl0tBJPU+z6oMrIhTUW74kU6Mb2N QmEPCSP6qntWLzd2 X-Received: by 10.99.99.7 with SMTP id x7mr20318448pgb.81.1501615003839; Tue, 01 Aug 2017 12:16:43 -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 i67sm51508111pfc.122.2017.08.01.12.16.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 12:16:41 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Howells , "Eric W . Biederman" , Linus Torvalds , Andrew Morton , James Morris , "Serge E. Hallyn" , Andy Lutomirski , John Johansen , Paul Moore , Casey Schaufler , Stephen Smalley , Tetsuo Handa , linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v5 02/15] exec: Correct comments about "point of no return" Date: Tue, 1 Aug 2017 12:16:25 -0700 Message-Id: <1501614998-62619-3-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501614998-62619-1-git-send-email-keescook@chromium.org> References: <1501614998-62619-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" Acked-by: Serge Hallyn --- fs/exec.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index a0fff86269e4..26b98072be50 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1259,6 +1259,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; @@ -1286,7 +1292,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 | @@ -1333,7 +1345,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())) @@ -1351,7 +1362,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;