From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B292C4828F for ; Fri, 2 Feb 2024 18:42:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07AD56B0085; Fri, 2 Feb 2024 13:42:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 027446B0087; Fri, 2 Feb 2024 13:42:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E588D6B0088; Fri, 2 Feb 2024 13:42:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D7E196B0085 for ; Fri, 2 Feb 2024 13:42:14 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 77C701C197E for ; Fri, 2 Feb 2024 18:42:14 +0000 (UTC) X-FDA: 81747733788.12.05F61BE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 92B20100006 for ; Fri, 2 Feb 2024 18:42:12 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ku6zuzzN; spf=pass (imf14.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706899332; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=U7zqPNLeOzITdl5LYbjOEm8d/dfeRoFB98j1bYReVR8=; b=Vjd2qGZgU6e2c3tqVhIEMZ9nBKWB5MaTtapPtPwJ8c5qPBX6aGHEJWXACfyKRc4m395di7 p3kWqeoWIfbBAe1vAUpCKiVul0d1eZM9MSIwtVs5WFgHjb92pLEJdRIIXTuMH3LFgluS5d Wf4MIW9Qx3xLEfLjvkRJqEQ4lMehwS0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ku6zuzzN; spf=pass (imf14.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706899332; a=rsa-sha256; cv=none; b=oOH6ekD/bwbTtUf7Cf/NvSgi6OkEoTmYNqMDyG60iWmxXQ8Q0A+YOyCYkB96uZqXhy5vlj Me2IpCJ4S2HmvARE6J0vkTSf6MgSJqcrDNOme8FwJLjklDS+1QjffjVOu6jxEK25o97uWl AwL7HTvu+lIJbK99sLRTjehiVx6MlWQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CABAC627F4; Fri, 2 Feb 2024 18:42:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB3D4C433C7; Fri, 2 Feb 2024 18:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706899331; bh=uezgj+oNmphdSlN+YJCe2E3qwAs5jx2TqUTdE4zM3s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ku6zuzzNIbi9A/s02NLgUU8okONmdLEpNsH16M6BIfmh9bu1BXW1c9fhjfXM1MYlY zLtwzefzC3fZimjrQSFuHwboIBrOoXBlI4ERudQqOMJI4TUuqLytJc+SaCrVLfIbAQ z44kWVoDTl6HUrT+KJbCz8KodCpjO7KqPEQOPZ2njanUtNokkx/grgMAtATYh+2SVc OpeGyYU+8QmkuRuTMtUfJmJPMqOmAzw/okghweZEM6nECVtwIyUZr46pwV6rxVj74m uPSnMgOvbnRCkB1i1e+HRlkUOcM6vJwKzRYm0KZ2bB/nvuoOU4a0+PIuLknCW9+2A4 WslHLdHkIEJHg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Kentaro Takeda , Tetsuo Handa , Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , Andrew Morton , Sebastian Andrzej Siewior , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Sasha Levin , mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, surenb@google.com, michael.christie@oracle.com, mst@redhat.com, mjguzik@gmail.com, npiggin@gmail.com, zhangpeng.00@bytedance.com, hca@linux.ibm.com Subject: [PATCH AUTOSEL 5.10 7/8] exec: Distinguish in_execve from in_exec Date: Fri, 2 Feb 2024 13:41:51 -0500 Message-ID: <20240202184156.541981-7-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202184156.541981-1-sashal@kernel.org> References: <20240202184156.541981-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.209 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 92B20100006 X-Rspam-User: X-Stat-Signature: ki3hthh3ssu8poatqg8xmjn8s9fes1nh X-Rspamd-Server: rspam01 X-HE-Tag: 1706899332-254724 X-HE-Meta: U2FsdGVkX1+783eI+TB/H+mI1Hc+onQdj6PKa77HPdTORO3UHD08tcSACWm5B/Vs/fGq76CQEflZo2C6W0+oZi/fuiHZzc1p8kfajdZB7M1gefgisQiKWiYXeF2OMVuwiAx+kRyGz2RJn9iz8X1XMrIHWV3XvgZuY3rK9k70YSw3h/kIPtddOYxZB8MNNxZrt5oQ3ScCaTFYEZHz5GSrf+f9WHzU6D3DTwCE37CtKU+JW+qVn4FEsF9YLEBFcWS+ac8pCDuHmcxkkaBczZ5MaXanvU7mDx+iq8+XnxYcLL5eyF7yjXEwg4JtEwKGbcbaMcgwHJkbiQjVlQ4b4C/R6wZcof6yy+PdqnwN1PpuacTB+ZQDL4Y483i1ohGlhe++lvJ2xQ/iCe5MjAZfKwcUQrKJLrz1w/GZ35GDIQud3aEpvvy8R7+rWrMJbfsW7jdljYDxR1uY0AgZP5Vsozvnv/P+EvrF71AkfxRYrejcVDfqv/vCg+fELKVf7QrUf7/V9VDmDzYlYn2aw6T7Xld/l5Q8pwAn8Xqc0hiFSOmQ65Nk5E7hABAMsvR5jyF68Ln0VDNMN5gZ4/FehD3/GPdApeFvloFocDGR5d9yUlkBmGK2ffxjc5YNbCzZKtD+yEfdiDCFkD9TE9Lp9dahOC2aGixTz4jRH5qH4nvwFV1DDcjNS/ax2Yf6Hf6wFtINYacHaaMpsk3PGrZ7MLA2/XVNjlroOOJTZBzkCFacM6XmDPc6DMinG8NUmx7HXoFJu/iIssNJbkTx4Xg7zttnKC07p0ek85pvpRgJu+tn2wxU8AlRVvK/wIBsVietKDfTj3XnBx+oLRrhHZ9NbtyxpYeAWlS29rny+YWXuq8i+GTbDDDzj0WNNveCFbSfcdfu0CF41pR4q7WoYwhaPJwGm16KYx8jeMYAryiyJdy3+xucdtlIehoLn7oDbFclKyyWv5TrdnaKTqQ/bSTTyGzE/wl FRH15xMz F8x5jd/b8bO65hvAkEVIRPRbS/9a7ZvPy3mtao/yNDObsgD3iaKp/5FGtejfuvd/2GKkgcbY6KaydI4gk8zT3RHaDJ4HF/OtkWezOqWbsgfOe8UcQA4Cv7WRheo/tEPeBPOLctBXn8DAaY2vLkvNsMwCk5AJUho4K21LP8hixQbY4uP8XM9zf2iFbVcOSWCj+m1+CUxFBsVFafxuaRlbj91J/LIK6SIz8dV/5b7sFt9KBXc0u8UltRnw6TSy5K78l4T0ATE0QqUOp771cZjcAU0cHQwgflbHP3hugiHCDxcWlXhlEUvwgEI8/Z38O9iRxrHleSVv0Zw8rKeukQRwVYIxMzcXEYnomBjManVpSdL3pqSNGAx+Om9JydQ7X396IyUZ8dErTKFqt+smgzM+BOye07ZHCXktTS31DA/mezqhsgQzy2vq4fcJyroPxU43NJCTaozVXGurAt+ZIs9r8InO+Rhj05Hgb2P9hm2+Kn8EDdA/h1vkO4iGQgDAs+jX9Nnt4qz14w7MvVekO/JSIzDHHGV/Uq4hwjbh+PF5DpVYgpQXe41PTRpx+9eTEp6iW2v9nz2Apv6D/Uu4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Kees Cook [ Upstream commit 90383cc07895183c75a0db2460301c2ffd912359 ] Just to help distinguish the fs->in_exec flag from the current->in_execve flag, add comments in check_unsafe_exec() and copy_fs() for more context. Also note that in_execve is only used by TOMOYO now. Cc: Kentaro Takeda Cc: Tetsuo Handa Cc: Alexander Viro Cc: Christian Brauner Cc: Jan Kara Cc: Eric Biederman Cc: Andrew Morton Cc: Sebastian Andrzej Siewior Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- fs/exec.c | 1 + include/linux/sched.h | 2 +- kernel/fork.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/exec.c b/fs/exec.c index 983295c0b8ac..b809f4a39296 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1565,6 +1565,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm) } rcu_read_unlock(); + /* "users" and "in_exec" locked for copy_fs() */ if (p->fs->users > n_fs) bprm->unsafe |= LSM_UNSAFE_SHARE; else diff --git a/include/linux/sched.h b/include/linux/sched.h index aa015416c569..65cfe85de8d5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -806,7 +806,7 @@ struct task_struct { */ unsigned sched_remote_wakeup:1; - /* Bit to tell LSMs we're in execve(): */ + /* Bit to tell TOMOYO we're in execve(): */ unsigned in_execve:1; unsigned in_iowait:1; #ifndef TIF_RESTORE_SIGMASK diff --git a/kernel/fork.c b/kernel/fork.c index 633b0af1d1a7..906dbaf25058 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1452,6 +1452,7 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) if (clone_flags & CLONE_FS) { /* tsk->fs is already what we want */ spin_lock(&fs->lock); + /* "users" and "in_exec" locked for check_unsafe_exec() */ if (fs->in_exec) { spin_unlock(&fs->lock); return -EAGAIN; -- 2.43.0