From: Dave Martin <Dave.Martin@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, stable@vger.kernel.org Subject: [PATCH] arm64: fpsimd: Prevent registers leaking across exec Date: Fri, 18 Aug 2017 16:57:01 +0100 [thread overview] Message-ID: <1503071821-13845-1-git-send-email-Dave.Martin@arm.com> (raw) There are some tricky dependencies between the different stages of flushing the FPSIMD register state during exec, and these can race with context switch in ways that can cause the old task's regs to leak across. In particular, a context switch during the memset() can cause some of the task's old FPSIMD registers to reappear. Disabling preemption for this small window would be no big deal for performance: preemption is already disabled for similar scenarios like updating the FPSIMD registers in sigreturn. So, instead of rearranging things in ways that might swap existing subtle bugs for new ones, this patch just disables preemption around the FPSIMD state flushing so that races of this type can't occur here. This brings fpsimd_flush_thread() into line with other code paths. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: stable@vger.kernel.org Fixes: 674c242c9323 ("arm64: flush FP/SIMD state correctly after execve()") Signed-off-by: Dave Martin <Dave.Martin@arm.com> --- NOTE TO MAINTAINERS: This is a fix, applicable to *v4.13* and stable. The kernel-mode NEON rework already queued for v4.14 turns this into a local_bh_disable() as a side effect, so does not strictly need this patch. When merging, the queued v4.14 changes should be retained. arch/arm64/kernel/fpsimd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 06da8ea..c7b4995 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -161,9 +161,11 @@ void fpsimd_flush_thread(void) { if (!system_supports_fpsimd()) return; + preempt_disable(); memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state)); fpsimd_flush_task_state(current); set_thread_flag(TIF_FOREIGN_FPSTATE); + preempt_enable(); } /* -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Dave.Martin@arm.com (Dave Martin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: fpsimd: Prevent registers leaking across exec Date: Fri, 18 Aug 2017 16:57:01 +0100 [thread overview] Message-ID: <1503071821-13845-1-git-send-email-Dave.Martin@arm.com> (raw) There are some tricky dependencies between the different stages of flushing the FPSIMD register state during exec, and these can race with context switch in ways that can cause the old task's regs to leak across. In particular, a context switch during the memset() can cause some of the task's old FPSIMD registers to reappear. Disabling preemption for this small window would be no big deal for performance: preemption is already disabled for similar scenarios like updating the FPSIMD registers in sigreturn. So, instead of rearranging things in ways that might swap existing subtle bugs for new ones, this patch just disables preemption around the FPSIMD state flushing so that races of this type can't occur here. This brings fpsimd_flush_thread() into line with other code paths. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: stable at vger.kernel.org Fixes: 674c242c9323 ("arm64: flush FP/SIMD state correctly after execve()") Signed-off-by: Dave Martin <Dave.Martin@arm.com> --- NOTE TO MAINTAINERS: This is a fix, applicable to *v4.13* and stable. The kernel-mode NEON rework already queued for v4.14 turns this into a local_bh_disable() as a side effect, so does not strictly need this patch. When merging, the queued v4.14 changes should be retained. arch/arm64/kernel/fpsimd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 06da8ea..c7b4995 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -161,9 +161,11 @@ void fpsimd_flush_thread(void) { if (!system_supports_fpsimd()) return; + preempt_disable(); memset(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state)); fpsimd_flush_task_state(current); set_thread_flag(TIF_FOREIGN_FPSTATE); + preempt_enable(); } /* -- 2.1.4
next reply other threads:[~2017-08-18 15:57 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-18 15:57 Dave Martin [this message] 2017-08-18 15:57 ` [PATCH] arm64: fpsimd: Prevent registers leaking across exec Dave Martin 2017-08-19 10:58 ` Ard Biesheuvel 2017-08-19 10:58 ` Ard Biesheuvel 2017-08-29 16:49 Dave Martin 2017-08-29 16:49 ` Dave Martin 2017-08-31 6:02 ` Greg KH 2017-08-31 6:02 ` Greg KH 2017-09-01 16:16 ` Dave Martin 2017-09-01 16:16 ` Dave Martin 2017-09-01 16:27 ` Greg KH 2017-09-01 16:27 ` Greg KH
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=1503071821-13845-1-git-send-email-Dave.Martin@arm.com \ --to=dave.martin@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=stable@vger.kernel.org \ --cc=will.deacon@arm.com \ /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: linkBe 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.