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 76E24C48291 for ; Fri, 2 Feb 2024 18:40:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 027106B0075; Fri, 2 Feb 2024 13:40:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F19906B007B; Fri, 2 Feb 2024 13:40:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE1646B007D; Fri, 2 Feb 2024 13:40:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D18276B0075 for ; Fri, 2 Feb 2024 13:40:05 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7195140F9B for ; Fri, 2 Feb 2024 18:40:05 +0000 (UTC) X-FDA: 81747728370.27.8EFAFFE Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf24.hostedemail.com (Postfix) with ESMTP id D2A0D180021 for ; Fri, 2 Feb 2024 18:40:01 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Jl+YNTKR; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 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=1706899202; 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=7CM5ytFtodtN1dRqockS8rs5eTtcpTG7gruc2hkdvyY=; b=AjBAFQRLoJUKhGvhrb0IQMsDCHQKLUZrftdUBENyD5s6wbWRn2wbEZDNFnXXVNJKg/gYu4 GjyvVR+UiJU0YG3dMmpvk4zanOACCth/CfE5A4ui70OkxpzbWh8c3GWODRE2bbf4HIk+AX YBUXcJlfc7R7Edl02k/H70GrgYQJHw4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706899202; a=rsa-sha256; cv=none; b=40BY3TtLSSUI9uFGN7lh/wjhHLlbSq94PHsRu2s4ZfyvXSITm8irWJNIWlDZB3HUQfNGir X4r00iqgJuwZeKQb4HpOMAd4YymoIrYdmjbrP6sMJi6y28Uy+DbzeAX3W4X5IKex4r+ij4 TkQCgTWBXzDGX4GKPXoDlVLvHwUZDrw= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Jl+YNTKR; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 86511CE2D14; Fri, 2 Feb 2024 18:39:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40F2FC433F1; Fri, 2 Feb 2024 18:39:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706899196; bh=/GgaPwcxXLMGw96QHxTmcd+p19bQxwEOIwtu1eiz/68=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jl+YNTKRZO5Z+q5sSVrCvBMLinJwzJiFHevf5cc0E850wSV7g+8YJQDZQyUeUF+mE 66v1RL822OouIsrLjzuoqzw8bNc1yXUogCD+igc/h3yBOt8YMeJfcrRG9GHa63sYD3 XRGw5dMxqGwVmSesZthdsLiKHZcZnluV+fl4+VmvkVayQR0LdJjPGMJxrw9o+0NaJ0 2z4Sy9mhBDn/qWCVktFC3bWRAljG6V9F26iTRI2yE9E4wbQcW3acwzKyK6Qk2IRHPB Hwa4u+UJBC677Us4mNUGr0Ok4VJMcyFeueoAcbelWSSpNNGBcg31n0n5m3znMryapY 96Og3VM/HUQfg== 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, mst@redhat.com, michael.christie@oracle.com, mjguzik@gmail.com, npiggin@gmail.com, zhangpeng.00@bytedance.com, hca@linux.ibm.com Subject: [PATCH AUTOSEL 6.7 18/23] exec: Distinguish in_execve from in_exec Date: Fri, 2 Feb 2024 13:39:14 -0500 Message-ID: <20240202183926.540467-18-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202183926.540467-1-sashal@kernel.org> References: <20240202183926.540467-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7.3 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D2A0D180021 X-Rspam-User: X-Stat-Signature: qrs3beguxhohazj4fwicdxozmndkdxyj X-Rspamd-Server: rspam03 X-HE-Tag: 1706899201-455080 X-HE-Meta: U2FsdGVkX1+OYlTNjZK76LmCqIVippJQvi9F9Dg99rCNoGIOntwU5SXoe7Rnedrf4HwanC/5C9VVP3kc+qf731QLo6Z+1UiOunriLlEacM22V8aYzjpd3qL8w8qDZwE65ouB2WdTrXwlhHnziyKLfuuc/HSr9EGONPPsYbaPoWsaev93cCz/KsyjJSIITuCY58SzmqtJ3KskxgZsEqWQKe4FvpSotsdIJF/K7JQvCHj8L2I3bC6ft9q2/bo8edrO7aMEAfGV1Pz5VfY+tzUgCYYBziV1KawmYNrDw+eVuErADGxqpq59K/V/H2peh+oKa9lgLHjnJthBPATWrCJoNcCgnTqAaJgYfr5tSopouu4rpGqVB6H5F+WWgUv/aHDeHax9s5vKUdloOg/+j31RIc6DoXvPOESiUokEFcvRKM2kWZ4a5hxbqvQTLMTAIrReoc90qw8DdFRLWQAYVxD0YuBTlwtAA3XWaa0uK0pyEsOJj0cei6Swkh8p44GkvRZ/0fCApW5bFwHPiOXBYET4xarAWgIuQsv9Zp61iPtkAK5vp78qPq8IfjULONJD6wR1d2mewDsNtXe1vngxQx8MpWZFkSdUMbgSHIeGnA/QZ3z8JYWPdbkHwtlfrBwrJIHopMBaZ+iQ/sMFfD48QJKZG6QSz/NLHQhyj2zPXH2pyNKxsUUbCfVaJTzWXF/76N70BdvblEzdbtxTkeTwxT+p+VKGE9c6uLp4/AXmzECnLUims+KDpI7I/H7KIoXU55833Tsn64J+x09qYdSDnrle7zOCscSq3sfSbC9viAtseqMs85Ii4WGvpgpmr07iCidz6tm/O0QqJ23OaSKuVIfmpE/yuMTL2Hs3tKhFNqF+4OfbgnQPsSXljQODXK8EnVPhjYhfmiTxzgN3YzOgVeShMCeruB996AITzgkoJyFm7rD7mEWpEzxxhK7f6amSzFBJJwUIqPELsEamTQzs/Iu mOnnxgGQ u88CPVGe67XUdb/F9nnW56ywJaGjvUwsv8eEXrzVCs2OFznbun0u2svdrcHEzYV934UqnyGfdr9Ns3iEEGTsn+HfkcOebf7VO2WWMzDYYtIXNJfQAl5XYdC0OaEzK0wFmJ2HQ1OzYA5oGpQYdVOMGpzegp2zst2XNiuMM4R7TTd1x1CsSDrKewMJDQGnjkYHyFnIPmPX6iQec0SVcW+/zdi+asX0GX0HYeeH8KChZN/XIRKIKvYJ99egW3FBiHPyOZklbugCJfPI+bpkreLe/o2Zqzzm4UXWz1xLwJN4y0qbyxRU8SM0eNkFrZdzsmtVfv8ilCpMSi+tQ+413WW3isDYms9hQjLvyDKsQO/iDT2R7MZtMleB6S6VLDMBUZ8DPW597T73lJ2kHGmXuzfyQIFfmzNd6VVVouUAWB3Scv8ZQ1Ugd/2B/8qTwt/T3hhqTcVQzMlw53bcCl4i0uXuGkAg8s8UiqsIL1JzFqZRyj7Dmdd9RFz2srdRmcoUJ7PdEsjt0aPQkmHrdaRnFn4NXfI/+FoPd2T8kcswcILOLzpfyJI8JBC7kFDqJKhKBgpWJ/J5vYvzgFbPron8= 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 4aa19b24f281..3842066d5b0b 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1588,6 +1588,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 292c31697248..de0e2752c5b2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -917,7 +917,7 @@ struct task_struct { unsigned sched_rt_mutex:1; #endif - /* 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 10917c3e1f03..0a08837e1443 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1754,6 +1754,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