From: Benjamin Berg <benjamin@sipsolutions.net>
To: linux-arch@vger.kernel.org, linux-um@lists.infradead.org,
x86@kernel.org, briannorris@chromium.org
Cc: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com,
Benjamin Berg <benjamin.berg@intel.com>
Subject: [PATCH 3/3] x86: avoid copying dynamic FP state from init_task
Date: Tue, 17 Dec 2024 21:27:45 +0100 [thread overview]
Message-ID: <20241217202745.1402932-4-benjamin@sipsolutions.net> (raw)
In-Reply-To: <20241217202745.1402932-1-benjamin@sipsolutions.net>
From: Benjamin Berg <benjamin.berg@intel.com>
The init_task instance of struct task_struct is statically allocated and
may not contain the full FP state for userspace. As such, limit the copy
to the valid area of init_task and fill the rest with zero.
Note that the FP state is only needed for userspace, and as such it is
entirely reasonable for init_task to not contain parts of it.
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Fixes: 5aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86")
---
arch/x86/kernel/process.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index f63f8fd00a91..1be45fe70cad 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -92,7 +92,15 @@ EXPORT_PER_CPU_SYMBOL_GPL(__tss_limit_invalid);
*/
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
{
- memcpy(dst, src, arch_task_struct_size);
+ /* init_task is not dynamically sized (incomplete FPU state) */
+ if (unlikely(src == &init_task)) {
+ memcpy(dst, src, sizeof(init_task));
+ memset((void *)dst + sizeof(init_task), 0,
+ arch_task_struct_size - sizeof(init_task));
+ } else {
+ memcpy(dst, src, arch_task_struct_size);
+ }
+
#ifdef CONFIG_VM86
dst->thread.vm86 = NULL;
#endif
--
2.47.1
next prev parent reply other threads:[~2024-12-17 20:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-17 20:27 [PATCH 0/3] KASAN fix for arch_dup_task_struct (x86, um) Benjamin Berg
2024-12-17 20:27 ` [PATCH 1/3] vmlinux.lds.h: remove entry to place init_task onto init_stack Benjamin Berg
2025-02-26 13:15 ` [tip: x86/fpu] vmlinux.lds.h: Remove " tip-bot2 for Benjamin Berg
2024-12-17 20:27 ` [PATCH 2/3] um: avoid copying FP state from init_task Benjamin Berg
2025-01-20 13:36 ` Thomas Weißschuh
2024-12-17 20:27 ` Benjamin Berg [this message]
2025-02-26 13:08 ` [PATCH 3/3] x86: avoid copying dynamic " Ingo Molnar
2025-02-26 13:19 ` Benjamin Berg
2025-02-26 13:23 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241217202745.1402932-4-benjamin@sipsolutions.net \
--to=benjamin@sipsolutions.net \
--cc=benjamin.berg@intel.com \
--cc=briannorris@chromium.org \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.