From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB1253054D8; Wed, 15 Oct 2025 12:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533108; cv=none; b=jLNI+9ovE2DOp0cSBy4CaVWcYrhe00FlaYPOzxrCGWJycXNtyJmjmbP4Im3y9ywfqRhEzs1cCmsuj5F770QMd612ouTqfWs71uyrqQuDFO13RmD3Juc91Wg/nS8z501QiJ/5rLj4/1qmwrEtPw4mIltzytIqNqw57pqs36ukdsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533108; c=relaxed/simple; bh=/chiFouok07D6GPiWTz73e9FYQNi+Yxs5DQX1oU2ntc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j98weNNanth9JBG0ID07AOnqeoFmQp4VA2FW7Rzw9hIYfwghBNi+fNiAtbAMIyxx7A4EDC60ThcrEYr9Z6gtUqMslkrz5299WMMQkOcFgaxSLRHR+vsvpNl4L+oYJGSh3ii0RoMebpsggAqKYR521i86dc38ifKrglr6IlbIH9A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p+6FzE+K; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p+6FzE+K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 350C1C4CEFE; Wed, 15 Oct 2025 12:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533107; bh=/chiFouok07D6GPiWTz73e9FYQNi+Yxs5DQX1oU2ntc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=p+6FzE+KXRRKRzsecRxd6ZrGPanaId9aszOeAINgHfzdda2HvAhfxZMG8UMk09cwu gR7n62Rmr5s8kZqjD8VynRcuZ4J1z4wYadu/9hBAupzXE3t/aF74UOI6NWrSYO5Tzo iIvNzXpth7+3iXsKUSQzyGqRddn+sH0YzYoKnLarh8R8aST4QygIviFJGzsPOM4vU8 Nh8kQoXnnv4IlmLb/oLq+/hEFs1rKBsyuAtzAvNnEtBtogz18NAhvqEEw9vGDqpPbJ dury4aOM0MNjVyaGQcuBX5b9UpSYRG8T96h5nps6VdxslpOfkF6WN/qN94OLtXOtvu 84NJeKN5Pj6VQ== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:05 +0100 Subject: [PATCH v22 1/8] arm64/gcs: Return a success value from gcs_alloc_thread_stack() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-1-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=3646; i=broonie@kernel.org; h=from:subject:message-id; bh=/chiFouok07D6GPiWTz73e9FYQNi+Yxs5DQX1oU2ntc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75pf3NHeqAdVzx/1eahcc4lfV4AUULQjqCEXm LnU4HIYTe+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aXwAKCRAk1otyXVSH 0EjBB/44FeWxrtl/BCRscMGE/9vYMws3Kmufn0VrASAp6p5I2cDsV7lC82nvgGTuycFW3btV0+E W0QHunctABhBDzHtZkPtG1AEqhmYpJ6e7RAkjfunhscez383Rotan6VcbQqOniMTYigB7FOMHGg xNY0ZspWXxHug79yQuboEhafh/aocd5EwjrU0skeOHvpvn6/4cNDVYV1sp0llSJGAfA7Xsoh3gg ZbqLeRXNU4O0LkpyQekyi1GlCBkQu6+I1pglXEvPsJg+SRU7UI5E3Bx/mUcjjAhRSbXoUqjL3BC 7/isTEMdEaGk2vZa3S72Nhmly6eZ8AA7yq3I0WUtEBOldGzZ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Currently as a result of templating from x86 code gcs_alloc_thread_stack() returns a pointer as an unsigned int however on arm64 we don't actually use this pointer value as anything other than a pass/fail flag. Simplify the interface to just return an int with 0 on success and a negative error code on failure. Acked-by: Deepak Gupta Reviewed-by: Catalin Marinas Signed-off-by: Mark Brown --- arch/arm64/include/asm/gcs.h | 8 ++++---- arch/arm64/kernel/process.c | 8 ++++---- arch/arm64/mm/gcs.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/gcs.h b/arch/arm64/include/asm/gcs.h index 8fa0707069e8..534ea5ae9281 100644 --- a/arch/arm64/include/asm/gcs.h +++ b/arch/arm64/include/asm/gcs.h @@ -64,8 +64,8 @@ static inline bool task_gcs_el0_enabled(struct task_struc= t *task) void gcs_set_el0_mode(struct task_struct *task); void gcs_free(struct task_struct *task); void gcs_preserve_current_state(void); -unsigned long gcs_alloc_thread_stack(struct task_struct *tsk, - const struct kernel_clone_args *args); +int gcs_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args); =20 static inline int gcs_check_locked(struct task_struct *task, unsigned long new_val) @@ -171,8 +171,8 @@ static inline void put_user_gcs(unsigned long val, unsi= gned long __user *addr, int *err) { } static inline void push_user_gcs(unsigned long val, int *err) { } =20 -static inline unsigned long gcs_alloc_thread_stack(struct task_struct *tsk, - const struct kernel_clone_args *args) +static inline int gcs_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args) { return -ENOTSUPP; } diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index fba7ca102a8c..4dadc70df16b 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -299,7 +299,7 @@ static void flush_gcs(void) static int copy_thread_gcs(struct task_struct *p, const struct kernel_clone_args *args) { - unsigned long gcs; + int ret; =20 if (!system_supports_gcs()) return 0; @@ -310,9 +310,9 @@ static int copy_thread_gcs(struct task_struct *p, p->thread.gcs_el0_mode =3D current->thread.gcs_el0_mode; p->thread.gcs_el0_locked =3D current->thread.gcs_el0_locked; =20 - gcs =3D gcs_alloc_thread_stack(p, args); - if (IS_ERR_VALUE(gcs)) - return PTR_ERR((void *)gcs); + ret =3D gcs_alloc_thread_stack(p, args); + if (ret !=3D 0) + return ret; =20 return 0; } diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c index 6e93f78de79b..3abcbf9adb5c 100644 --- a/arch/arm64/mm/gcs.c +++ b/arch/arm64/mm/gcs.c @@ -38,8 +38,8 @@ static unsigned long gcs_size(unsigned long size) return max(PAGE_SIZE, size); } =20 -unsigned long gcs_alloc_thread_stack(struct task_struct *tsk, - const struct kernel_clone_args *args) +int gcs_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args) { unsigned long addr, size; =20 @@ -59,13 +59,13 @@ unsigned long gcs_alloc_thread_stack(struct task_struct= *tsk, size =3D gcs_size(size); addr =3D alloc_gcs(0, size); if (IS_ERR_VALUE(addr)) - return addr; + return PTR_ERR((void *)addr); =20 tsk->thread.gcs_base =3D addr; tsk->thread.gcs_size =3D size; tsk->thread.gcspr_el0 =3D addr + size - sizeof(u64); =20 - return addr; + return 0; } =20 SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size= , unsigned int, flags) --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE3C43054D8; Wed, 15 Oct 2025 12:58:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533114; cv=none; b=QWqKjj+XOmMiou/YsxAzE4vT5Sl8FvDef3FfIZEtRuF+HUDNtO6quZeFyn0dq3ErFUjupAFid7to3zYqDu5QRIW1dNdZpik2LwkoqHUCprqzd1IJBYPR6hydvJJVqh357Hhk3xHIFOqWvm8Lzv0I57tfbrVk/3V+c/ED0GQ/xbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533114; c=relaxed/simple; bh=dfXyEY8CiPyIcVQsZrmOCMoMeqoG7oZoagKIn7gHJe4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dzejRc9rOx65XBLn+jW9Xg+oKTvIokx9mWFjdMx7UnOCTwpDKedhX+Fv78ZkQDmknLCIMitkF1lNvpUUvdUz6OsAailRIcxq/rUpkeb6bb4XGwq8+FZE3a6o7rfCHQguZFRxe9Zmueu2bKCuhGHuDE0TqoYO48C4IdCyYBlrJPQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sfyLRgSb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sfyLRgSb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1994C4CEF8; Wed, 15 Oct 2025 12:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533114; bh=dfXyEY8CiPyIcVQsZrmOCMoMeqoG7oZoagKIn7gHJe4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=sfyLRgSbPH7lUSfYUNY3mM3i4Trfvo89lZBOiRj8t8kSdFjkYyrKY5/tA4wrUfbKJ QrFP2nnw9XEKjiuzQC1HWapObG9G/GoEvD+DlV2lw2YMDViWfyty6bypUmvNVXub9H rXxc0xJ2a7uEfdcxmRFw79aTHo8uHu5CXNvYBu7mtui3+1IVVffwAhyU+NduFAt8no rxWSp/x1Vl6C90mqaN0za3uQ2ACUDWbG+bjkLzxINayqnpXoh3qCd1jf5+FWgqsMVK Kyc6UA4QwTWDcLHe5JfihpqYBeVVi5th4aRto4lRpN9PcYADUpD+/FVzHZDA6Tqq79 I3QZhRHTaKtwg== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:06 +0100 Subject: [PATCH v22 2/8] Documentation: userspace-api: Add shadow stack API documentation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-2-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=3290; i=broonie@kernel.org; h=from:subject:message-id; bh=dfXyEY8CiPyIcVQsZrmOCMoMeqoG7oZoagKIn7gHJe4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75pg7+BE1Xjf8o3f8pbdTx4VXUgHuRBGBYVve ZcJYquH8+OJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aYAAKCRAk1otyXVSH 0I57B/0Wk1CasKB4a15SIVnUWK9COAOTB4MykLgoZsakGVMrHYBt6KXmweYgYkylvTLlZYiroHe X1vcJ3xKjo7G4kD3P08RRJWTdY2EnowXyXHYOCjj0J0ntneAEvfNdiCRHuB1zq5+7kBWXlv2sYO ObtqlYDnfipYC0m8iut4PVzeON/eTWlX4/ycrMco1IV80LAY64L78q6P/e7lg+YNbprUwq/KaXL LQa5pSf+UU2ggUk1WfhcI5ta0g/8Qb06AXA35PM9bTDzf3tC+xH6L1mk6kpBnSir8zrUBhkXZK+ bOMMu3RV+x6vSkCoNIbVE3choadBCu7hDo/7pS6r5+nlTpK2 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB There are a number of architectures with shadow stack features which we are presenting to userspace with as consistent an API as we can (though there are some architecture specifics). Especially given that there are some important considerations for userspace code interacting directly with the feature let's provide some documentation covering the common aspects. Reviewed-by: Catalin Marinas Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Acked-by: Yury Khrustalev Reviewed-by: Deepak Gupta Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- Documentation/userspace-api/index.rst | 1 + Documentation/userspace-api/shadow_stack.rst | 44 ++++++++++++++++++++++++= ++++ 2 files changed, 45 insertions(+) diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspac= e-api/index.rst index b8c73be4fb11..0167e59b541e 100644 --- a/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst @@ -62,6 +62,7 @@ Everything else =20 ELF netlink/index + shadow_stack sysfs-platform_profile vduse futex2 diff --git a/Documentation/userspace-api/shadow_stack.rst b/Documentation/u= serspace-api/shadow_stack.rst new file mode 100644 index 000000000000..42617d0470ba --- /dev/null +++ b/Documentation/userspace-api/shadow_stack.rst @@ -0,0 +1,44 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Shadow Stacks +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Introduction +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Several architectures have features which provide backward edge +control flow protection through a hardware maintained stack, only +writable by userspace through very limited operations. This feature +is referred to as shadow stacks on Linux, on x86 it is part of Intel +Control Enforcement Technology (CET), on arm64 it is Guarded Control +Stacks feature (FEAT_GCS) and for RISC-V it is the Zicfiss extension. +It is expected that this feature will normally be managed by the +system dynamic linker and libc in ways broadly transparent to +application code, this document covers interfaces and considerations. + + +Enabling +=3D=3D=3D=3D=3D=3D=3D=3D + +Shadow stacks default to disabled when a userspace process is +executed, they can be enabled for the current thread with a syscall: + + - For x86 the ARCH_SHSTK_ENABLE arch_prctl() + - For other architectures the PR_SET_SHADOW_STACK_ENABLE prctl() + +It is expected that this will normally be done by the dynamic linker. +Any new threads created by a thread with shadow stacks enabled will +themselves have shadow stacks enabled. + + +Enablement considerations +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + +- Returning from the function that enables shadow stacks without first + disabling them will cause a shadow stack exception. This includes + any syscall wrapper or other library functions, the syscall will need + to be inlined. +- A lock feature allows userspace to prevent disabling of shadow stacks. +- Those that change the stack context like longjmp() or use of ucontext + changes on signal return will need support from libc. --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D15B1DDC37; Wed, 15 Oct 2025 12:58:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533121; cv=none; b=I4jPBhrXKWEkFmRXvgQE/myf4ivITrRcy9EUfIVv5e1wOR2zr1E7uOcOSDK+fQ38KTY6R7nEymi3ThTTDifrNgIfFvy0D42GdhSBPG7ZJRlz6490UswwsT0XEHlg7SywSA5V6Q1QUI7gfAgscMOQvMguWQfoOlyrwHfxXGO23xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533121; c=relaxed/simple; bh=nNmlD9EmtQs7DQ3E1+baw3RuNzSum5fEbD/Mgf1lruY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KRQ0jkc7qH+0zp8JUzBJMzQAEpnDdMnaf3hIHIgCS7K2HIjVtAX8eNiNhnakZ7Jw7ZKwBNcl6Wxrwq9Qz6uFJ8ZBN0rmZJ7tQw24zF1+/oYUERoYFYXiJmE4s+je1ibrTIM2AevD15h4XejgCKmupbmFZhzeQwsCtSPdYbtErjs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MvshsFoA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MvshsFoA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3C70C16AAE; Wed, 15 Oct 2025 12:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533121; bh=nNmlD9EmtQs7DQ3E1+baw3RuNzSum5fEbD/Mgf1lruY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MvshsFoAsW+O6dsIVMMoVauKuergDqPJWvrpMp+HrQRGLj7k3Hay0vfEbdZVsE/Iy hk+U7B1wL8XxuU4KoaeNFCD18Ku9LPrwWbDJ7EIWdT7EEQ3dkVKUYVDiK/KldZcKCW u3CHRsWemJdBQWmwO3yU9EdwQhLGaGk+jmcUxKObZAWyQE6s20zDcveTDfnrYTjanu W27h9pJGYdalpiObC9hZaAVLG6xWj+MW6YkaS7l8Rmsk7hlVOuNv7V3pjPwgLl6RVQ /soU9CkWOMC5ngp6h1bZ6lNhC/xBGzYUBFQPfty3MVehZJ4Y3HZV1Kj0y6QFuLD4rg C/4R3zpS9scrw== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:07 +0100 Subject: [PATCH v22 3/8] selftests: Provide helper header for shadow stack testing Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-3-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=4438; i=broonie@kernel.org; h=from:subject:message-id; bh=nNmlD9EmtQs7DQ3E1+baw3RuNzSum5fEbD/Mgf1lruY=; b=owGbwMvMwMWocq27KDak/QLjabUkhoz3sxJX6Ypq7pGWCVY0dov3bpNI3P7i1zeZyP6ciMrui VmB3A2djMYsDIxcDLJiiixrn2WsSg+X2Dr/0fxXMINYmUCmMHBxCsBEipTY/1nGL0xa3NGp+DC4 f71CwO/bXf/8zhg/PbCYe0ok62X1wxm7vIz5exk3npb5EmJ/JNFgR7WMu93sQzelGifM+x7o2+H UvD3kyPmDx5cFr9BvmbW9/fwjbqaKp5LaWR852k4tSQh5scTyvJWXmp2pV0Hv7T7eagtPm+tGfg aZMjrciyoCQ+d7ZZek32CcdEpWfa1Xk42Z/JrK37tX/J41xUOacYugzfPXSq93Fk556/eWX2FtV 8u17memLxdmxe1p8znPcdjoqOPDouqnBocWB0z+J8Lfc35939/uFpU3Hex9e3Wz/xvWbb3A4Sbw M8/lfF+ocGDpzObpHFLPzOUX3JnD+zzN5OlJ1vQ1llqvAQ== X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB While almost all users of shadow stacks should be relying on the dynamic linker and libc to enable the feature there are several low level test programs where it is useful to enable without any libc support, allowing testing without full system enablement. This low level testing is helpful during bringup of the support itself, and also in enabling coverage by automated testing without needing all system components in the target root filesystems to have enablement. Provide a header with helpers for this purpose, intended for use only by test programs directly exercising shadow stack interfaces. Reviewed-by: Rick Edgecombe Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Acked-by: Catalin Marinas Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/ksft_shstk.h | 98 ++++++++++++++++++++++++++++++++= ++++ 1 file changed, 98 insertions(+) diff --git a/tools/testing/selftests/ksft_shstk.h b/tools/testing/selftests= /ksft_shstk.h new file mode 100644 index 000000000000..fecf91218ea5 --- /dev/null +++ b/tools/testing/selftests/ksft_shstk.h @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Helpers for shadow stack enablement, this is intended to only be + * used by low level test programs directly exercising interfaces for + * working with shadow stacks. + * + * Copyright (C) 2024 ARM Ltd. + */ + +#ifndef __KSFT_SHSTK_H +#define __KSFT_SHSTK_H + +#include + +/* This is currently only defined for x86 */ +#ifndef SHADOW_STACK_SET_TOKEN +#define SHADOW_STACK_SET_TOKEN (1ULL << 0) +#endif + +static bool shadow_stack_enabled; + +#ifdef __x86_64__ +#define ARCH_SHSTK_ENABLE 0x5001 +#define ARCH_SHSTK_SHSTK (1ULL << 0) + +#define ARCH_PRCTL(arg1, arg2) \ +({ \ + long _ret; \ + register long _num asm("eax") =3D __NR_arch_prctl; \ + register long _arg1 asm("rdi") =3D (long)(arg1); \ + register long _arg2 asm("rsi") =3D (long)(arg2); \ + \ + asm volatile ( \ + "syscall\n" \ + : "=3Da"(_ret) \ + : "r"(_arg1), "r"(_arg2), \ + "0"(_num) \ + : "rcx", "r11", "memory", "cc" \ + ); \ + _ret; \ +}) + +#define ENABLE_SHADOW_STACK +static __always_inline void enable_shadow_stack(void) +{ + int ret =3D ARCH_PRCTL(ARCH_SHSTK_ENABLE, ARCH_SHSTK_SHSTK); + if (ret =3D=3D 0) + shadow_stack_enabled =3D true; +} + +#endif + +#ifdef __aarch64__ +#define PR_SET_SHADOW_STACK_STATUS 75 +# define PR_SHADOW_STACK_ENABLE (1UL << 0) + +#define my_syscall2(num, arg1, arg2) = \ +({ = \ + register long _num __asm__ ("x8") =3D (num); \ + register long _arg1 __asm__ ("x0") =3D (long)(arg1); \ + register long _arg2 __asm__ ("x1") =3D (long)(arg2); \ + register long _arg3 __asm__ ("x2") =3D 0; \ + register long _arg4 __asm__ ("x3") =3D 0; \ + register long _arg5 __asm__ ("x4") =3D 0; \ + \ + __asm__ volatile ( \ + "svc #0\n" \ + : "=3Dr"(_arg1) \ + : "r"(_arg1), "r"(_arg2), \ + "r"(_arg3), "r"(_arg4), \ + "r"(_arg5), "r"(_num) \ + : "memory", "cc" \ + ); \ + _arg1; \ +}) + +#define ENABLE_SHADOW_STACK +static __always_inline void enable_shadow_stack(void) +{ + int ret; + + ret =3D my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, + PR_SHADOW_STACK_ENABLE); + if (ret =3D=3D 0) + shadow_stack_enabled =3D true; +} + +#endif + +#ifndef __NR_map_shadow_stack +#define __NR_map_shadow_stack 453 +#endif + +#ifndef ENABLE_SHADOW_STACK +static inline void enable_shadow_stack(void) { } +#endif + +#endif --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 156C4324B0C; Wed, 15 Oct 2025 12:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533129; cv=none; b=nkxwxBGuXb5T61gWFjiHTI8GyfMoeVZIVQONZW4kNoRGW2OBTULop1mvlXlyD3Wm9x6C0ixhe1c7gQRWdTuSim/JdAcIoei3CHFKu/w3sDzrzUzvYt/Pa1wy9yyz1WmufDGmZkLC9DA1Z3ocQhVzHnZhTkr7p+CAa5H9DUFnf1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533129; c=relaxed/simple; bh=SAVL+Io+Ij3k8D38yjFJDZ/Brxlp76SKkOKPZ2cG5Q0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dPM+YeXY2m2JHCF3jg7geRNoTW+O0sWAfxfZcwWPFgio6NiZzOfIib06guFHDzgez5AuW8f7Rqr0fvuK3djn/vwsDcBg+R8E1iq0Ha3cxQoX/UdxSilnZBwdPyw71k78Lu9ZeZEzxnWJIq6dDr8F/Nr9CZFI3eY1IvX6v9RmtP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nvP6o4NA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nvP6o4NA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77C26C19421; Wed, 15 Oct 2025 12:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533127; bh=SAVL+Io+Ij3k8D38yjFJDZ/Brxlp76SKkOKPZ2cG5Q0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nvP6o4NAbko7nSSCYGjuvWNCDxGLF6wVFDyBwOsYq1BcamBa5G9Y0yxkduOxXrqB8 IQAaofx2t71WRzanStoYiJjPVqWUkY/tOXvFJC4dOEH6KXS4fn8IusnEw6Wqe2EPI+ lUW56j86ahBuNuUDEziKQQKnx44TxH8qsHmGNfJnhsBXJWGzCl5A0DhC2cDmCTIgJj DmZ86KBl7bWo0L2vI2tEzOZrYZOZH3Xxk4fwDO/k3MmogqmzKB0DtcZ/kFpdN9BCU8 vabL/n6RmQETqF/b3NRiRWmCBred+wIV054sjz17eKZYwHDFojiQO3qIZUqLRFfaNJ zzeLkbgAVOK9Q== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:08 +0100 Subject: [PATCH v22 4/8] fork: Add shadow stack support to clone3() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-4-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=16150; i=broonie@kernel.org; h=from:subject:message-id; bh=SAVL+Io+Ij3k8D38yjFJDZ/Brxlp76SKkOKPZ2cG5Q0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75piRPf5uJrneDnOONOQqRCgCRTrtwQM8RUsq u5az9oO54OJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aYgAKCRAk1otyXVSH 0D5YB/9QRYhF/Tcu8aq/pgxfGwdgIF85fk9OBJVO1bYR/j0O9W2Zyk4gND9AL1vZE6UHPwyhlOr WumznheeD8NG3D17/N//fjAxLj/gCENikHyQan5MBD1lUeRUpjRbX0IIaS51u4w7DCSXviq3H3q 5tllUqShbONdvqsnaGoS+zo3MUAjJZqEmaZYSPWrc6eazZNa1syFQ1yjWrMA3D8pEvGFhQiHY0M c/bhYraTOVxNPH61NIixuao6ql0Yl9IRHThc6aTHrDz3r9G5ByGtdHj2PxFRU9SvALfyUPAnyHr Ri2gTbFxpZkPKNPWcjFriYaImpa+s+jbaoY4Lv7yu70tqUSr X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Unlike with the normal stack there is no API for configuring the shadow stack for a new thread, instead the kernel will dynamically allocate a new shadow stack with the same size as the normal stack. This appears to be due to the shadow stack series having been in development since before the more extensible clone3() was added rather than anything more deliberate. Add a parameter to clone3() specifying a shadow stack pointer to use for the new thread, this is inconsistent with the way we specify the normal stack but during review concerns were expressed about having to identify where the shadow stack pointer should be placed especially in cases where the shadow stack has been previously active. If no shadow stack is specified then the existing implicit allocation behaviour is maintained. If a shadow stack pointer is specified then it is required to have an architecture defined token placed on the stack, this will be consumed by the new task, the shadow stack is specified by pointing to this token. If no valid token is present then this will be reported with -EINVAL. This token prevents new threads being created pointing at the shadow stack of an existing running thread. On architectures with support for userspace pivoting of shadow stacks it is expected that the same format and placement of tokens will be used, this is the case for arm64 and x86. If the architecture does not support shadow stacks the shadow stack pointer must be not be specified, architectures that do support the feature are expected to enforce the same requirement on individual systems that lack shadow stack support. Update the existing arm64 and x86 implementations to pay attention to the newly added arguments, in order to maintain compatibility we use the existing behaviour if no shadow stack is specified. Since we are now using more fields from the kernel_clone_args we pass that into the shadow stack code rather than individual fields. Portions of the x86 architecture code were written by Rick Edgecombe. Acked-by: Yury Khrustalev Reviewed-by: Rick Edgecombe Reviewed-by: Catalin Marinas Signed-off-by: Mark Brown --- arch/arm64/mm/gcs.c | 47 +++++++++++++++++++- arch/x86/include/asm/shstk.h | 11 +++-- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/shstk.c | 53 ++++++++++++++++++++--- include/asm-generic/cacheflush.h | 11 +++++ include/linux/sched/task.h | 17 ++++++++ include/uapi/linux/sched.h | 9 ++-- kernel/fork.c | 93 ++++++++++++++++++++++++++++++++++--= ---- 8 files changed, 217 insertions(+), 26 deletions(-) diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c index 3abcbf9adb5c..fd1d5a6655de 100644 --- a/arch/arm64/mm/gcs.c +++ b/arch/arm64/mm/gcs.c @@ -43,8 +43,23 @@ int gcs_alloc_thread_stack(struct task_struct *tsk, { unsigned long addr, size; =20 - if (!system_supports_gcs()) + if (!system_supports_gcs()) { + if (args->shstk_token) + return -EINVAL; + return 0; + } + + /* + * If the user specified a GCS then use it, otherwise fall + * back to a default allocation strategy. Validation is done + * in arch_shstk_validate_clone(). + */ + if (args->shstk_token) { + tsk->thread.gcs_base =3D 0; + tsk->thread.gcs_size =3D 0; + return 0; + } =20 if (!task_gcs_el0_enabled(tsk)) return 0; @@ -68,6 +83,36 @@ int gcs_alloc_thread_stack(struct task_struct *tsk, return 0; } =20 +static bool gcs_consume_token(struct vm_area_struct *vma, struct page *pag= e, + unsigned long user_addr) +{ + u64 expected =3D GCS_CAP(user_addr); + u64 *token =3D page_address(page) + offset_in_page(user_addr); + + if (!cmpxchg_to_user_page(vma, page, user_addr, token, expected, 0)) + return false; + set_page_dirty_lock(page); + + return true; +} + +int arch_shstk_validate_clone(struct task_struct *tsk, + struct vm_area_struct *vma, + struct page *page, + struct kernel_clone_args *args) +{ + unsigned long gcspr_el0; + int ret =3D 0; + + gcspr_el0 =3D args->shstk_token; + if (!gcs_consume_token(vma, page, gcspr_el0)) + return -EINVAL; + + tsk->thread.gcspr_el0 =3D gcspr_el0 + sizeof(u64); + + return ret; +} + SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size= , unsigned int, flags) { unsigned long alloc_size; diff --git a/arch/x86/include/asm/shstk.h b/arch/x86/include/asm/shstk.h index fc7dcec58fd4..42a5f03a51e2 100644 --- a/arch/x86/include/asm/shstk.h +++ b/arch/x86/include/asm/shstk.h @@ -6,6 +6,7 @@ #include =20 struct task_struct; +struct kernel_clone_args; struct ksignal; =20 #ifdef CONFIG_X86_USER_SHADOW_STACK @@ -16,8 +17,8 @@ struct thread_shstk { =20 long shstk_prctl(struct task_struct *task, int option, unsigned long arg2); void reset_thread_features(void); -unsigned long shstk_alloc_thread_stack(struct task_struct *p, u64 clone_fl= ags, - unsigned long stack_size); +unsigned long shstk_alloc_thread_stack(struct task_struct *p, + const struct kernel_clone_args *args); void shstk_free(struct task_struct *p); int setup_signal_shadow_stack(struct ksignal *ksig); int restore_signal_shadow_stack(void); @@ -30,8 +31,10 @@ static inline long shstk_prctl(struct task_struct *task,= int option, unsigned long arg2) { return -EINVAL; } static inline void reset_thread_features(void) {} static inline unsigned long shstk_alloc_thread_stack(struct task_struct *p, - u64 clone_flags, - unsigned long stack_size) { return 0; } + const struct kernel_clone_args *args) +{ + return 0; +} static inline void shstk_free(struct task_struct *p) {} static inline int setup_signal_shadow_stack(struct ksignal *ksig) { return= 0; } static inline int restore_signal_shadow_stack(void) { return 0; } diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 4c718f8adc59..449da29a9f92 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -219,7 +219,7 @@ int copy_thread(struct task_struct *p, const struct ker= nel_clone_args *args) * is disabled, new_ssp will remain 0, and fpu_clone() will know not to * update it. */ - new_ssp =3D shstk_alloc_thread_stack(p, clone_flags, args->stack_size); + new_ssp =3D shstk_alloc_thread_stack(p, args); if (IS_ERR_VALUE(new_ssp)) return PTR_ERR((void *)new_ssp); =20 diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index 978232b6d48d..d66c866274d0 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -191,18 +191,61 @@ void reset_thread_features(void) current->thread.features_locked =3D 0; } =20 -unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, u64 clone_= flags, - unsigned long stack_size) +int arch_shstk_validate_clone(struct task_struct *t, + struct vm_area_struct *vma, + struct page *page, + struct kernel_clone_args *args) +{ + void *maddr =3D page_address(page); + unsigned long token; + int offset; + u64 expected; + + /* + * kernel_clone_args() verification assures token address is 8 + * byte aligned. + */ + token =3D args->shstk_token; + expected =3D (token + SS_FRAME_SIZE) | BIT(0); + offset =3D offset_in_page(token); + + if (!cmpxchg_to_user_page(vma, page, token, (unsigned long *)(maddr + off= set), + expected, 0)) + return -EINVAL; + set_page_dirty_lock(page); + + return 0; +} + +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args) { struct thread_shstk *shstk =3D &tsk->thread.shstk; + u64 clone_flags =3D args->flags; unsigned long addr, size; =20 /* * If shadow stack is not enabled on the new thread, skip any - * switch to a new shadow stack. + * implicit switch to a new shadow stack and reject attempts to + * explicitly specify one. */ - if (!features_enabled(ARCH_SHSTK_SHSTK)) + if (!features_enabled(ARCH_SHSTK_SHSTK)) { + if (args->shstk_token) + return (unsigned long)ERR_PTR(-EINVAL); + return 0; + } + + /* + * If the user specified a shadow stack then use it, otherwise + * fall back to a default allocation strategy. Validation is + * done in arch_shstk_validate_clone(). + */ + if (args->shstk_token) { + shstk->base =3D 0; + shstk->size =3D 0; + return args->shstk_token + 8; + } =20 /* * For CLONE_VFORK the child will share the parents shadow stack. @@ -222,7 +265,7 @@ unsigned long shstk_alloc_thread_stack(struct task_stru= ct *tsk, u64 clone_flags, if (!(clone_flags & CLONE_VM)) return 0; =20 - size =3D adjust_shstk_size(stack_size); + size =3D adjust_shstk_size(args->stack_size); addr =3D alloc_shstk(0, size, 0, false); if (IS_ERR_VALUE(addr)) return addr; diff --git a/include/asm-generic/cacheflush.h b/include/asm-generic/cachefl= ush.h index 7ee8a179d103..96cc0c7a5c90 100644 --- a/include/asm-generic/cacheflush.h +++ b/include/asm-generic/cacheflush.h @@ -124,4 +124,15 @@ static inline void flush_cache_vunmap(unsigned long st= art, unsigned long end) } while (0) #endif =20 +#ifndef cmpxchg_to_user_page +#define cmpxchg_to_user_page(vma, page, vaddr, ptr, old, new) \ +({ \ + bool ret; \ + \ + ret =3D try_cmpxchg(ptr, &old, new); \ + flush_icache_user_page(vma, page, vaddr, sizeof(*ptr)); \ + ret; \ +}) +#endif + #endif /* _ASM_GENERIC_CACHEFLUSH_H */ diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index 525aa2a632b2..7f860edc58da 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -16,6 +16,7 @@ struct task_struct; struct rusage; union thread_union; struct css_set; +struct vm_area_struct; =20 /* All the bits taken by the old clone syscall. */ #define CLONE_LEGACY_FLAGS 0xffffffffULL @@ -44,6 +45,7 @@ struct kernel_clone_args { struct cgroup *cgrp; struct css_set *cset; unsigned int kill_seq; + unsigned long shstk_token; }; =20 /* @@ -225,4 +227,19 @@ static inline void task_unlock(struct task_struct *p) =20 DEFINE_GUARD(task_lock, struct task_struct *, task_lock(_T), task_unlock(_= T)) =20 +#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK +int arch_shstk_validate_clone(struct task_struct *p, + struct vm_area_struct *vma, + struct page *page, + struct kernel_clone_args *args); +#else +static inline int arch_shstk_validate_clone(struct task_struct *p, + struct vm_area_struct *vma, + struct page *page, + struct kernel_clone_args *args) +{ + return 0; +} +#endif + #endif /* _LINUX_SCHED_TASK_H */ diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h index 359a14cc76a4..7e18e7b3df3a 100644 --- a/include/uapi/linux/sched.h +++ b/include/uapi/linux/sched.h @@ -84,6 +84,7 @@ * kernel's limit of nested PID namespaces. * @cgroup: If CLONE_INTO_CGROUP is specified set this to * a file descriptor for the cgroup. + * @shstk_token: Pointer to shadow stack token at top of stack. * * The structure is versioned by size and thus extensible. * New struct members must go at the end of the struct and @@ -101,12 +102,14 @@ struct clone_args { __aligned_u64 set_tid; __aligned_u64 set_tid_size; __aligned_u64 cgroup; + __aligned_u64 shstk_token; }; #endif =20 -#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ -#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */ -#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */ +#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ +#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */ +#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */ +#define CLONE_ARGS_SIZE_VER3 96 /* sizeof fourth published struct */ =20 /* * Scheduling policies diff --git a/kernel/fork.c b/kernel/fork.c index 3da0f08615a9..a0b8eeeb1d27 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1915,6 +1915,51 @@ static bool need_futex_hash_allocate_default(u64 clo= ne_flags) return true; } =20 +static int shstk_validate_clone(struct task_struct *p, + struct kernel_clone_args *args) +{ + struct mm_struct *mm; + struct vm_area_struct *vma; + struct page *page; + unsigned long addr; + int ret; + + if (!IS_ENABLED(CONFIG_ARCH_HAS_USER_SHADOW_STACK)) + return 0; + + if (!args->shstk_token) + return 0; + + mm =3D get_task_mm(p); + if (!mm) + return -EFAULT; + + mmap_read_lock(mm); + + addr =3D untagged_addr_remote(mm, args->shstk_token); + page =3D get_user_page_vma_remote(mm, addr, FOLL_FORCE | FOLL_WRITE, + &vma); + if (IS_ERR(page)) { + ret =3D -EFAULT; + goto out; + } + + if (!(vma->vm_flags & VM_SHADOW_STACK) || + !(vma->vm_flags & VM_WRITE)) { + ret =3D -EFAULT; + goto out_page; + } + + ret =3D arch_shstk_validate_clone(p, vma, page, args); + +out_page: + put_page(page); +out: + mmap_read_unlock(mm); + mmput(mm); + return ret; +} + /* * This creates a new process as a copy of the old one, * but does not actually start it yet. @@ -2188,6 +2233,9 @@ __latent_entropy struct task_struct *copy_process( if (retval) goto bad_fork_cleanup_namespaces; retval =3D copy_thread(p, args); + if (retval) + goto bad_fork_cleanup_io; + retval =3D shstk_validate_clone(p, args); if (retval) goto bad_fork_cleanup_io; =20 @@ -2765,7 +2813,9 @@ static noinline int copy_clone_args_from_user(struct = kernel_clone_args *kargs, CLONE_ARGS_SIZE_VER1); BUILD_BUG_ON(offsetofend(struct clone_args, cgroup) !=3D CLONE_ARGS_SIZE_VER2); - BUILD_BUG_ON(sizeof(struct clone_args) !=3D CLONE_ARGS_SIZE_VER2); + BUILD_BUG_ON(offsetofend(struct clone_args, shstk_token) !=3D + CLONE_ARGS_SIZE_VER3); + BUILD_BUG_ON(sizeof(struct clone_args) !=3D CLONE_ARGS_SIZE_VER3); =20 if (unlikely(usize > PAGE_SIZE)) return -E2BIG; @@ -2798,16 +2848,17 @@ static noinline int copy_clone_args_from_user(struc= t kernel_clone_args *kargs, return -EINVAL; =20 *kargs =3D (struct kernel_clone_args){ - .flags =3D args.flags, - .pidfd =3D u64_to_user_ptr(args.pidfd), - .child_tid =3D u64_to_user_ptr(args.child_tid), - .parent_tid =3D u64_to_user_ptr(args.parent_tid), - .exit_signal =3D args.exit_signal, - .stack =3D args.stack, - .stack_size =3D args.stack_size, - .tls =3D args.tls, - .set_tid_size =3D args.set_tid_size, - .cgroup =3D args.cgroup, + .flags =3D args.flags, + .pidfd =3D u64_to_user_ptr(args.pidfd), + .child_tid =3D u64_to_user_ptr(args.child_tid), + .parent_tid =3D u64_to_user_ptr(args.parent_tid), + .exit_signal =3D args.exit_signal, + .stack =3D args.stack, + .stack_size =3D args.stack_size, + .tls =3D args.tls, + .set_tid_size =3D args.set_tid_size, + .cgroup =3D args.cgroup, + .shstk_token =3D args.shstk_token, }; =20 if (args.set_tid && @@ -2848,6 +2899,24 @@ static inline bool clone3_stack_valid(struct kernel_= clone_args *kargs) return true; } =20 +/** + * clone3_shadow_stack_valid - check and prepare shadow stack + * @kargs: kernel clone args + * + * Verify that shadow stacks are only enabled if supported. + */ +static inline bool clone3_shadow_stack_valid(struct kernel_clone_args *kar= gs) +{ + if (!kargs->shstk_token) + return true; + + if (!IS_ALIGNED(kargs->shstk_token, sizeof(void *))) + return false; + + /* Fail if the kernel wasn't built with shadow stacks */ + return IS_ENABLED(CONFIG_ARCH_HAS_USER_SHADOW_STACK); +} + static bool clone3_args_valid(struct kernel_clone_args *kargs) { /* Verify that no unknown flags are passed along. */ @@ -2870,7 +2939,7 @@ static bool clone3_args_valid(struct kernel_clone_arg= s *kargs) kargs->exit_signal) return false; =20 - if (!clone3_stack_valid(kargs)) + if (!clone3_stack_valid(kargs) || !clone3_shadow_stack_valid(kargs)) return false; =20 return true; --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8F2832BF4B; Wed, 15 Oct 2025 12:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533135; cv=none; b=nke0uoB5IxpIdpllQTTAEd0qfLfnNsu/kbCrzmzJ1YFUnO5lIhVYnce6FopLB+EyN2PUEkoSFzXKJwSyd9wDhXX1BLETI7t85Bxd5NojKUDJblTt5bj0m36lqvcN5+e/HaqsC+dQ3pI8M3qhtkle6MYGgYmiqtGhngRbokimSQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533135; c=relaxed/simple; bh=G2v3D4/5iR/LZHZvCBfhlozkUaTX+ywQSj46YnqYN9U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a6iJlVC9z7OJk4/RVqR5gk4yelc2uak1/Ku9Kz01qU369LO+lGSAQLUJMqKLLhLbIwVnUkq5gUlvIyU1TI5/Ae5G0RfrlhqoRCMfdGwXuq5zS/LYO9IP/cwvPt7DdBjcjmFZfWCYOLMfD+hRfIBV0R+mlN3bge/n3nVxaeohGPQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YxDj0rjl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YxDj0rjl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2016DC116C6; Wed, 15 Oct 2025 12:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533134; bh=G2v3D4/5iR/LZHZvCBfhlozkUaTX+ywQSj46YnqYN9U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YxDj0rjl1UoL3QvB9IYy9Ti+/H5KZrjQG88q/ud5ejEOdDmqABZLQYbwp0IZcmSmS Rgd8siyqxhlITnku6e1mg4zkKk76VjocJCE7Giiuw4c1YwUGWS6yex5f3zMGF2ff+i 14o4O5i8gAjksBuF4lYkFcS9vdxKGqEFMbdYCLA2D9SoftxRQB88UXm6GZGwQta/c4 hh/jn3bDgaxOHD5FPyIFX4UuK/0F+dVP9uP6D7ontfAXyhleKTcG+iJBHeq131l+IM 5XwyvzxPR06amSvKdImHzhvzky96O0L3gpr87qGB/I4IdKE5jJztksgbf/YcpG2m/v PSDaoG0zJJ4TA== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:09 +0100 Subject: [PATCH v22 5/8] selftests/clone3: Remove redundant flushes of output streams Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-5-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=1170; i=broonie@kernel.org; h=from:subject:message-id; bh=G2v3D4/5iR/LZHZvCBfhlozkUaTX+ywQSj46YnqYN9U=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75pi+bwCAjbL4SOEMAN8349es/xLtk6I71kCb giyMPVZWauJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aYgAKCRAk1otyXVSH 0LC7B/9nIx54HlDHNp1nRJ5UhPSuJEQlD7fsJzgs/SiZHKUCElX8sk+hlRBR0vrhPE/QvIk8PVM vXoY11V7qjvlrt9kIqZUH3KG+0DqcQcaCK+eIsRZFr304x3oWYeUoYHPosmgOSXKEqexC26mpOR +qt5DZ9vdyvm/RTXZ1eaqfdJJDryVUVF1UJ78GJuFngbjDHTH4QbOP17M/1/4Fr47l4BNXCY5vy VkzPDQZcCdYaWS/f54g71qWcICi0ocgDFYDMjXfhdLicuQSOZbn6hQMpIRxB5r6hJOsPg6eQ/IC 8brEdwr3Orwv/FbkVHGRE1fKpmcEgfCKfvEMoKZTa3QKjrWl X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Since there were widespread issues with output not being flushed the kselftest framework was modified to explicitly set the output streams unbuffered in commit 58e2847ad2e6 ("selftests: line buffer test program's stdout") so there is no need to explicitly flush in the clone3 tests. Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Reviewed-by: Catalin Marinas Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/clone3/clone3_selftests.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/testing/selftests/clone3/clone3_selftests.h b/tools/test= ing/selftests/clone3/clone3_selftests.h index eeca8005723f..939b26c86d42 100644 --- a/tools/testing/selftests/clone3/clone3_selftests.h +++ b/tools/testing/selftests/clone3/clone3_selftests.h @@ -35,8 +35,6 @@ struct __clone_args { =20 static pid_t sys_clone3(struct __clone_args *args, size_t size) { - fflush(stdout); - fflush(stderr); return syscall(__NR_clone3, args, size); } =20 --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C558632A3D8; Wed, 15 Oct 2025 12:59:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533141; cv=none; b=RvBqnAoC8uSUT2m1MdfYdYC/TgW5wS3MMeN1XNPz816zNBQsy5uIBFu+auaUN++0nRVxeDezKDDSmS5t/+Kz7HotdAxpI2+0O10jfOcPiqHtSGHhQFa+4eRcrmqq8WXv3EuKBHFhw3/sTXKx5jdHfNbmEEm26QtF5VWL77IrmBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533141; c=relaxed/simple; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PvQJmjvzjxOm4SulsG4qzhHuDMEdbA8gGR2OecPzUsizMS/Gnt9WeiQJq+SmUSpk4mxOXbUrwuy2tn4lp0DsX8hfHtHOVPzarPE7PrI2kqSmn8gyQ5877Xn7nG/+OJnIhPu1C9BebRN6Sp50PIxn396oRDMYw34JMxzt+gqHa+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a3mrvmUq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a3mrvmUq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3AB4C116D0; Wed, 15 Oct 2025 12:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533141; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a3mrvmUq8OILXUrWHusIPjsq34F1FxWcWaEPk9dhrulUeBin5wPdro/JeUunimAuj FWIf8fyUsAyCvw27St/V56fChcGgVFFp1C7LvScX8/iYsAsajNf5ubE7iJKA+eG3GN 2m3olklq4x2678/OthFXHSD0y39Zw3I21LyYCi1Pw9ROEMz8u9F0Mt/4oBfvtv8MeG shM2C/XBCmcPWlcyfZWeqGbewo2xO7VWyVyb3J0+D7sh/daeXROAsjpfCCkOppa3e7 iGDVBdGLVUeXRtCh23sSCCf6XeHSWZU9b3V3P+yanJennDcCDPMrZjaRNbpoqH9UCZ kQGYt4aSH81Tg== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:10 +0100 Subject: [PATCH v22 6/8] selftests/clone3: Factor more of main loop into test_clone3() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-6-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=3987; i=broonie@kernel.org; h=from:subject:message-id; bh=tAuylQj+jXMT0ulfEEiUYEaHrJIDwHN10sPhMMvpM2c=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75pjfQ2D++L0pXfWB0RXIC5VTjj7yviEjJ6JY PmCoSO06XKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aYwAKCRAk1otyXVSH 0GIbB/wIAZBNc18z6EWOOlp6pWgZ3VszqpS0OWXnTL30mEDU1hJkeXS15tGzev2PEVKAC/ICS+7 /eZxRN2UDbvBMKyNrV2T4MaC0MIIS1tz+oDzApK9AT7i6sk51RQW298CNmHiGMtZXhcvPrnD3I1 +P4BeyVjTSWe/+v6I/zxmCIA3HzYMMbZDE0WqPE2/WIASXlA0tV1svijmi1QEZWl7WoiB7CUnoZ Do7ppxb+1EgOJk7gfmkVLcr1KM+N+oGABwWUfx2cMdeyXbjUaK9VSSvbPmHelcN9hpVe0EQdATH DCaLhAZpng81ezg0hiAtfvIab82J0iUv3M/wUQ0+6gvOsbvn X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB In order to make it easier to add more configuration for the tests and more support for runtime detection of when tests can be run pass the structure describing the tests into test_clone3() rather than picking the arguments out of it and have that function do all the per-test work. No functional change. Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Reviewed-by: Catalin Marinas Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/clone3/clone3.c | 77 ++++++++++++++++-------------= ---- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selfte= sts/clone3/clone3.c index e61f07973ce5..e066b201fa64 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -30,6 +30,19 @@ enum test_mode { CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG, }; =20 +typedef bool (*filter_function)(void); +typedef size_t (*size_function)(void); + +struct test { + const char *name; + uint64_t flags; + size_t size; + size_function size_function; + int expected; + enum test_mode test_mode; + filter_function filter; +}; + static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mo= de) { struct __clone_args args =3D { @@ -109,30 +122,40 @@ static int call_clone3(uint64_t flags, size_t size, e= num test_mode test_mode) return 0; } =20 -static bool test_clone3(uint64_t flags, size_t size, int expected, - enum test_mode test_mode) +static void test_clone3(const struct test *test) { + size_t size; int ret; =20 + if (test->filter && test->filter()) { + ksft_test_result_skip("%s\n", test->name); + return; + } + + if (test->size_function) + size =3D test->size_function(); + else + size =3D test->size; + + ksft_print_msg("Running test '%s'\n", test->name); + ksft_print_msg( "[%d] Trying clone3() with flags %#" PRIx64 " (size %zu)\n", - getpid(), flags, size); - ret =3D call_clone3(flags, size, test_mode); + getpid(), test->flags, size); + ret =3D call_clone3(test->flags, size, test->test_mode); ksft_print_msg("[%d] clone3() with flags says: %d expected %d\n", - getpid(), ret, expected); - if (ret !=3D expected) { + getpid(), ret, test->expected); + if (ret !=3D test->expected) { ksft_print_msg( "[%d] Result (%d) is different than expected (%d)\n", - getpid(), ret, expected); - return false; + getpid(), ret, test->expected); + ksft_test_result_fail("%s\n", test->name); + return; } =20 - return true; + ksft_test_result_pass("%s\n", test->name); } =20 -typedef bool (*filter_function)(void); -typedef size_t (*size_function)(void); - static bool not_root(void) { if (getuid() !=3D 0) { @@ -160,16 +183,6 @@ static size_t page_size_plus_8(void) return getpagesize() + 8; } =20 -struct test { - const char *name; - uint64_t flags; - size_t size; - size_function size_function; - int expected; - enum test_mode test_mode; - filter_function filter; -}; - static const struct test tests[] =3D { { .name =3D "simple clone3()", @@ -319,24 +332,8 @@ int main(int argc, char *argv[]) ksft_set_plan(ARRAY_SIZE(tests)); test_clone3_supported(); =20 - for (i =3D 0; i < ARRAY_SIZE(tests); i++) { - if (tests[i].filter && tests[i].filter()) { - ksft_test_result_skip("%s\n", tests[i].name); - continue; - } - - if (tests[i].size_function) - size =3D tests[i].size_function(); - else - size =3D tests[i].size; - - ksft_print_msg("Running test '%s'\n", tests[i].name); - - ksft_test_result(test_clone3(tests[i].flags, size, - tests[i].expected, - tests[i].test_mode), - "%s\n", tests[i].name); - } + for (i =3D 0; i < ARRAY_SIZE(tests); i++) + test_clone3(&tests[i]); =20 ksft_finished(); } --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C01E32E729; Wed, 15 Oct 2025 12:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533151; cv=none; b=cGLgZbcIfXpL+J0JEQtqbc41N5RUXWIZDVIJaJUCEXM1fnDljMFuy3rQLnZ23/j8hMyB4GGNz0f+1GZA7/UlZJ57Rm3oI3XOT69LI6ib7gnq1RK9LUT0tNa+EF1e3be7x776n8QsTVmINTBGvZria03Ok2Z+M4bFjDkDxHIiFhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533151; c=relaxed/simple; bh=G8bBSQKlO7rId1LDmFNrephPZ8IGhE5zllPW+If3ahk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KIQl00/dRjIEULHGp3pyKQU/tm0iwh16OC63n6S0twM8oQElOexIHMO0tYbBh09iRvDk/0ytqtjlkXD5iMSX5M5T8G3fRCbhnGGVh0RP15bP3Qwa+ZZSkKL+TOlF5nff1c47Q1sOBfwFmScHRKn8LyoQcTL4vV6ZOR4rdQoAmqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ahNnBIeV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ahNnBIeV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE3AC113D0; Wed, 15 Oct 2025 12:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533148; bh=G8bBSQKlO7rId1LDmFNrephPZ8IGhE5zllPW+If3ahk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ahNnBIeVchAasUGr3M66wmskOmoLqKw2cgWvWpjCuPmDQgR/X7zrkXso/PWXkOxST Pk5B9UDZtkgRpJy9+CRf28xaLwGJQuGSOFVkQd7//VhywobPWYSC3AhCJYxzRwl/vt zRb96J0VKCcTPwKM/GNs1R2SrR5GJlWl0JGyvjgj6k1gf7wRZcL/+AMTMoUislE+v1 9bVMJcFRZvBCdiIp6HxG1X3fLwsZbMbq6ql2m+Y/52hayQOt3Wm9x64SIWQvS5NEY+ f+7fOQPEUPdGpNxSu67Og4BdynVZysIihtVidpvPR/Vmiubz7E0A2uVzFcwSnB8Pf0 4R+gmJ5eGnQMw== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:11 +0100 Subject: [PATCH v22 7/8] selftests/clone3: Allow tests to flag if -E2BIG is a valid error code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-7-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=2131; i=broonie@kernel.org; h=from:subject:message-id; bh=G8bBSQKlO7rId1LDmFNrephPZ8IGhE5zllPW+If3ahk=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75pkHLTKCUgpWHOh+ij3lvSQvDKvLdoB+SUXx EiKLMPd6T6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aZAAKCRAk1otyXVSH 0GMzB/4wzMKj8DGLbRrvxWJPUxC6Y5DlzZKzv5BllDHRtwCSiXqg0XSiQO5Rv5E/JhfXurtIXAy 1ZetbI1d23syPFjGtnqde4mKrEc4g3GQh5wdzQLNAWb9jW/IX+QJgKlXJZH+NahW/qF7ILxskzw E76a66SNVJ5P/wAO1jYokH7mrU838ZHaXqZRdAVePxbW0ohOzF2nnVlagaaKlPZjverarn+Chc+ KpQnZ8Vssp8ZovMJSyNz116uPMK2ajRgWtb7sRvrxcJlXsfR943cOeS813rD5XceSrnVQrht8b2 qpUY2newB1tXxYD87FEkUH3TYbZFAUF3vzaYr5kbkOxRUj2U X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB The clone_args structure is extensible, with the syscall passing in the length of the structure. Inside the kernel we use copy_struct_from_user() to read the struct but this has the unfortunate side effect of silently accepting some overrun in the structure size providing the extra data is all zeros. This means that we can't discover the clone3() features that the running kernel supports by simply probing with various struct sizes. We need to check this for the benefit of test systems which run newer kselftests on old kernels. Add a flag which can be set on a test to indicate that clone3() may return -E2BIG due to the use of newer struct versions. Currently no tests need this but it will become an issue for testing clone3() support for shadow stacks, the support for shadow stacks is already present on x86. Reviewed-by: Kees Cook Tested-by: Kees Cook Acked-by: Shuah Khan Reviewed-by: Catalin Marinas Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/clone3/clone3.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selfte= sts/clone3/clone3.c index e066b201fa64..5b8b7d640e70 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -39,6 +39,7 @@ struct test { size_t size; size_function size_function; int expected; + bool e2big_valid; enum test_mode test_mode; filter_function filter; }; @@ -146,6 +147,11 @@ static void test_clone3(const struct test *test) ksft_print_msg("[%d] clone3() with flags says: %d expected %d\n", getpid(), ret, test->expected); if (ret !=3D test->expected) { + if (test->e2big_valid && ret =3D=3D -E2BIG) { + ksft_print_msg("Test reported -E2BIG\n"); + ksft_test_result_skip("%s\n", test->name); + return; + } ksft_print_msg( "[%d] Result (%d) is different than expected (%d)\n", getpid(), ret, test->expected); --=20 2.47.2 From nobody Sun Dec 14 22:11:54 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08CA5326D5D; Wed, 15 Oct 2025 12:59:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533156; cv=none; b=IupOwnOcS1RxtwuiI1nQCABwCy+bqBShV7w17/MPxjl01ULEA0SKQVafpkMfjXmOdH3Wvh7nYCVmVOKCLNQX+f/ITrRk9c6hZt6iS2bF4zFgK4tqpkn0gLvwtRiAJyWPHFay/LEl73NPori6TTdsuvbBhOl5dJqX+TFCs8iTo5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760533156; c=relaxed/simple; bh=mUUhy8eHAcGKRfmLcRSd+y92dcd9rdNBB/3LR6srMP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pCxR5JLYdFaS3kzjqS3uBN/vnSDzj0+qfhCSCZBc40PTALPQLiVwFlHmT7sDPrFe12Oc3pgqrGZh6ph11uOH4bIbNSf2pOuZcJ999WqtauanK9jqCqn/QFCjwh5AlmcYxZCM9RCeozXDRAaWEQK3gOWKEJJKJK5HJQP9wbQ6UqY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RBoBXb2u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RBoBXb2u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6B5EC16AAE; Wed, 15 Oct 2025 12:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760533155; bh=mUUhy8eHAcGKRfmLcRSd+y92dcd9rdNBB/3LR6srMP4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RBoBXb2uHFweSDbKfvgii/rUEGG3MAvGQwKvIEwiKWlitwd9/4+l6QkWOOXnww5e4 Yx+xT5v1lp3oJJVA8DRmdPMmfXuPSVSTNUMovsNkrCSuwOdJF/xLn5K0O5cEXYEx3U cZmt6rS16SJHfVGLLdv3WHgJER2d4XnpkM8ilOQxr7iJUlwnY2JmlvOxxD6H0j0ifj azEIrF527Sh2hEyUTMyZYWKCx9mVw7D4kNe+Y28RIrE7H3VXc9AeA0EgVLWI+6lkML YBT22mZ+PwCw0wXr7cFwS3xqohtjKgclc6MmP9sadYBc9jTA0+i/9ZuFAEQgP6HTlQ dYlJwQWeZUJRw== From: Mark Brown Date: Wed, 15 Oct 2025 13:49:12 +0100 Subject: [PATCH v22 8/8] selftests/clone3: Test shadow stack support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251015-clone3-shadow-stack-v22-8-a8c8da011427@kernel.org> References: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> In-Reply-To: <20251015-clone3-shadow-stack-v22-0-a8c8da011427@kernel.org> To: "Rick P. Edgecombe" , Deepak Gupta , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, Andrew Morton , Yury Khrustalev , "H.J. Lu" , Adhemerval Zanella Netto , Wilco Dijkstra , CarlosO'Donell , Florian Weimer , Rich Felker , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , Shuah Khan X-Mailer: b4 0.15-dev-96507 X-Developer-Signature: v=1; a=openpgp-sha256; l=10209; i=broonie@kernel.org; h=from:subject:message-id; bh=mUUhy8eHAcGKRfmLcRSd+y92dcd9rdNBB/3LR6srMP4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBo75plAQyl67tCeW7J8/gQFrM6/sKRHjIbfNL/C phx/nmjPc6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaO+aZQAKCRAk1otyXVSH 0CcQB/9Kz1S5lMLic+S3KpxpWSKIgC983TyXL5nP08Z6sQO50CF/zgFT+pQv5XUqLhnMoooWvf3 P7ryFh6e6b3pbWEFCiPVzJZ3JjooBkoLbX49/VRgxhwpfHYNqjQ4R4a2GDyr9sYeG3AcxjWIfIO miqxkUnX9OCUOFiN6B4zvtzE0RWiSe8moq2vQSYgzoUMigs3tnkIHDucivgAojnwB9EoX6D6lwB k7ZvqqpqfmM0B+/qTjEd2W1Ub3tSwIfeRcOEQp7u8I62II6cmvm1oByIcTiODs6t71p2aFQAYsK wEhL+52zNN6533D4HY2UGtt1Ctcn918oJF7Lzg4j9F/QQ7Z5 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Add basic test coverage for specifying the shadow stack for a newly created thread via clone3(), including coverage of the newly extended argument structure. We check that a user specified shadow stack can be provided, and that invalid combinations of parameters are rejected. In order to facilitate testing on systems without userspace shadow stack support we manually enable shadow stacks on startup, this is architecture specific due to the use of an arch_prctl() on x86. Due to interactions with potential userspace locking of features we actually detect support for shadow stacks on the running system by attempting to allocate a shadow stack page during initialisation using map_shadow_stack(), warning if this succeeds when the enable failed. In order to allow testing of user configured shadow stacks on architectures with that feature we need to ensure that we do not return from the function where the clone3() syscall is called in the child process, doing so would trigger a shadow stack underflow. To do this we use inline assembly rather than the standard syscall wrapper to call clone3(). In order to avoid surprises we also use a syscall rather than the libc exit() function., this should be overly cautious. Acked-by: Shuah Khan Tested-by: Rick Edgecombe Signed-off-by: Mark Brown --- tools/testing/selftests/clone3/clone3.c | 143 ++++++++++++++++++= +++- tools/testing/selftests/clone3/clone3_selftests.h | 63 ++++++++++ 2 files changed, 205 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selfte= sts/clone3/clone3.c index 5b8b7d640e70..05c3d2dcbf2a 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -3,6 +3,7 @@ /* Based on Christian Brauner's clone3() example */ =20 #define _GNU_SOURCE +#include #include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -19,8 +21,12 @@ #include =20 #include "../kselftest.h" +#include "../ksft_shstk.h" #include "clone3_selftests.h" =20 +static bool shadow_stack_supported; +static size_t max_supported_args_size; + enum test_mode { CLONE3_ARGS_NO_TEST, CLONE3_ARGS_ALL_0, @@ -28,6 +34,10 @@ enum test_mode { CLONE3_ARGS_INVAL_EXIT_SIGNAL_NEG, CLONE3_ARGS_INVAL_EXIT_SIGNAL_CSIG, CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG, + CLONE3_ARGS_SHADOW_STACK, + CLONE3_ARGS_SHADOW_STACK_MISALIGNED, + CLONE3_ARGS_SHADOW_STACK_NO_TOKEN, + CLONE3_ARGS_SHADOW_STACK_NORMAL_MEMORY, }; =20 typedef bool (*filter_function)(void); @@ -44,6 +54,44 @@ struct test { filter_function filter; }; =20 + +/* + * We check for shadow stack support by attempting to use + * map_shadow_stack() since features may have been locked by the + * dynamic linker resulting in spurious errors when we attempt to + * enable on startup. We warn if the enable failed. + */ +static void test_shadow_stack_supported(void) +{ + long ret; + + ret =3D syscall(__NR_map_shadow_stack, 0, getpagesize(), 0); + if (ret =3D=3D -1) { + ksft_print_msg("map_shadow_stack() not supported\n"); + } else if ((void *)ret =3D=3D MAP_FAILED) { + ksft_print_msg("Failed to map shadow stack\n"); + } else { + ksft_print_msg("Shadow stack supportd\n"); + shadow_stack_supported =3D true; + + if (!shadow_stack_enabled) + ksft_print_msg("Mapped but did not enable shadow stack\n"); + } +} + +static void *get_shadow_stack_page(unsigned long flags) +{ + unsigned long long page; + + page =3D syscall(__NR_map_shadow_stack, 0, getpagesize(), flags); + if ((void *)page =3D=3D MAP_FAILED) { + ksft_print_msg("map_shadow_stack() failed: %d\n", errno); + return 0; + } + + return (void *)page; +} + static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mo= de) { struct __clone_args args =3D { @@ -57,6 +105,7 @@ static int call_clone3(uint64_t flags, size_t size, enum= test_mode test_mode) } args_ext; =20 pid_t pid =3D -1; + void *p; int status; =20 memset(&args_ext, 0, sizeof(args_ext)); @@ -89,6 +138,26 @@ static int call_clone3(uint64_t flags, size_t size, enu= m test_mode test_mode) case CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG: args.exit_signal =3D 0x00000000000000f0ULL; break; + case CLONE3_ARGS_SHADOW_STACK: + p =3D get_shadow_stack_page(SHADOW_STACK_SET_TOKEN); + p +=3D getpagesize() - sizeof(void *); + args.shstk_token =3D (unsigned long long)p; + break; + case CLONE3_ARGS_SHADOW_STACK_MISALIGNED: + p =3D get_shadow_stack_page(SHADOW_STACK_SET_TOKEN); + p +=3D getpagesize() - sizeof(void *) - 1; + args.shstk_token =3D (unsigned long long)p; + break; + case CLONE3_ARGS_SHADOW_STACK_NORMAL_MEMORY: + p =3D malloc(getpagesize()); + p +=3D getpagesize() - sizeof(void *); + args.shstk_token =3D (unsigned long long)p; + break; + case CLONE3_ARGS_SHADOW_STACK_NO_TOKEN: + p =3D get_shadow_stack_page(0); + p +=3D getpagesize() - sizeof(void *); + args.shstk_token =3D (unsigned long long)p; + break; } =20 memcpy(&args_ext.args, &args, sizeof(struct __clone_args)); @@ -102,7 +171,12 @@ static int call_clone3(uint64_t flags, size_t size, en= um test_mode test_mode) =20 if (pid =3D=3D 0) { ksft_print_msg("I am the child, my PID is %d\n", getpid()); - _exit(EXIT_SUCCESS); + /* + * Use a raw syscall to ensure we don't get issues + * with manually specified shadow stack and exit handlers. + */ + syscall(__NR_exit, EXIT_SUCCESS); + ksft_print_msg("CHILD FAILED TO EXIT PID is %d\n", getpid()); } =20 ksft_print_msg("I am the parent (%d). My child's pid is %d\n", @@ -184,6 +258,26 @@ static bool no_timenamespace(void) return true; } =20 +static bool have_shadow_stack(void) +{ + if (shadow_stack_supported) { + ksft_print_msg("Shadow stack supported\n"); + return true; + } + + return false; +} + +static bool no_shadow_stack(void) +{ + if (!shadow_stack_supported) { + ksft_print_msg("Shadow stack not supported\n"); + return true; + } + + return false; +} + static size_t page_size_plus_8(void) { return getpagesize() + 8; @@ -327,6 +421,50 @@ static const struct test tests[] =3D { .expected =3D -EINVAL, .test_mode =3D CLONE3_ARGS_NO_TEST, }, + { + .name =3D "Shadow stack on system with shadow stack", + .size =3D 0, + .expected =3D 0, + .e2big_valid =3D true, + .test_mode =3D CLONE3_ARGS_SHADOW_STACK, + .filter =3D no_shadow_stack, + }, + { + .name =3D "Shadow stack with misaligned address", + .flags =3D CLONE_VM, + .size =3D 0, + .expected =3D -EINVAL, + .e2big_valid =3D true, + .test_mode =3D CLONE3_ARGS_SHADOW_STACK_MISALIGNED, + .filter =3D no_shadow_stack, + }, + { + .name =3D "Shadow stack with normal memory", + .flags =3D CLONE_VM, + .size =3D 0, + .expected =3D -EFAULT, + .e2big_valid =3D true, + .test_mode =3D CLONE3_ARGS_SHADOW_STACK_NORMAL_MEMORY, + .filter =3D no_shadow_stack, + }, + { + .name =3D "Shadow stack with no token", + .flags =3D CLONE_VM, + .size =3D 0, + .expected =3D -EINVAL, + .e2big_valid =3D true, + .test_mode =3D CLONE3_ARGS_SHADOW_STACK_NO_TOKEN, + .filter =3D no_shadow_stack, + }, + { + .name =3D "Shadow stack on system without shadow stack", + .flags =3D CLONE_VM, + .size =3D 0, + .expected =3D -EFAULT, + .e2big_valid =3D true, + .test_mode =3D CLONE3_ARGS_SHADOW_STACK_NORMAL_MEMORY, + .filter =3D have_shadow_stack, + }, }; =20 int main(int argc, char *argv[]) @@ -334,9 +472,12 @@ int main(int argc, char *argv[]) size_t size; int i; =20 + enable_shadow_stack(); + ksft_print_header(); ksft_set_plan(ARRAY_SIZE(tests)); test_clone3_supported(); + test_shadow_stack_supported(); =20 for (i =3D 0; i < ARRAY_SIZE(tests); i++) test_clone3(&tests[i]); diff --git a/tools/testing/selftests/clone3/clone3_selftests.h b/tools/test= ing/selftests/clone3/clone3_selftests.h index 939b26c86d42..147b4ed36b5c 100644 --- a/tools/testing/selftests/clone3/clone3_selftests.h +++ b/tools/testing/selftests/clone3/clone3_selftests.h @@ -31,12 +31,75 @@ struct __clone_args { __aligned_u64 set_tid; __aligned_u64 set_tid_size; __aligned_u64 cgroup; +#ifndef CLONE_ARGS_SIZE_VER2 +#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */ +#endif + __aligned_u64 shstk_token; +#ifndef CLONE_ARGS_SIZE_VER3 +#define CLONE_ARGS_SIZE_VER3 96 /* sizeof fourth published struct */ +#endif }; =20 +/* + * For architectures with shadow stack support we need to be + * absolutely sure that the clone3() syscall will be inline and not a + * function call so we open code. + */ +#ifdef __x86_64__ +static __always_inline pid_t sys_clone3(struct __clone_args *args, size_t = size) +{ + register long _num __asm__ ("rax") =3D __NR_clone3; + register long _args __asm__ ("rdi") =3D (long)(args); + register long _size __asm__ ("rsi") =3D (long)(size); + long ret; + + __asm__ volatile ( + "syscall\n" + : "=3Da"(ret) + : "r"(_args), "r"(_size), + "0"(_num) + : "rcx", "r11", "memory", "cc" + ); + + if (ret < 0) { + errno =3D -ret; + return -1; + } + + return ret; +} +#elif defined(__aarch64__) +static __always_inline pid_t sys_clone3(struct __clone_args *args, size_t = size) +{ + register long _num __asm__ ("x8") =3D __NR_clone3; + register long _args __asm__ ("x0") =3D (long)(args); + register long _size __asm__ ("x1") =3D (long)(size); + register long arg2 __asm__ ("x2") =3D 0; + register long arg3 __asm__ ("x3") =3D 0; + register long arg4 __asm__ ("x4") =3D 0; + + __asm__ volatile ( + "svc #0\n" + : "=3Dr"(_args) + : "r"(_args), "r"(_size), + "r"(_num), "r"(arg2), + "r"(arg3), "r"(arg4) + : "memory", "cc" + ); + + if ((int)_args < 0) { + errno =3D -((int)_args); + return -1; + } + + return _args; +} +#else static pid_t sys_clone3(struct __clone_args *args, size_t size) { return syscall(__NR_clone3, args, size); } +#endif =20 static inline void test_clone3_supported(void) { --=20 2.47.2