* FAILED: patch "[PATCH] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation" failed to apply to 5.16-stable tree
@ 2022-04-04 7:40 gregkh
2022-04-05 11:04 ` [PATCH][Rebased for 5.16] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation Chang S. Bae
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2022-04-04 7:40 UTC (permalink / raw)
To: yang.zhong, bonzini, chang.seok.bae, tglx; +Cc: stable
The patch below does not apply to the 5.16-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 063452fd94d153d4eb38ad58f210f3d37a09cca4 Mon Sep 17 00:00:00 2001
From: Yang Zhong <yang.zhong@intel.com>
Date: Sat, 29 Jan 2022 09:36:46 -0800
Subject: [PATCH] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation
ARCH_REQ_XCOMP_PERM is supposed to add the requested feature to the
permission bitmap of thread_group_leader()->fpu. But the code overwrites
the bitmap with the requested feature bit only rather than adding it.
Fix the code to add the requested feature bit to the master bitmask.
Fixes: db8268df0983 ("x86/arch_prctl: Add controls for dynamic XSTATE components")
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Paolo Bonzini <bonzini@gnu.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220129173647.27981-2-chang.seok.bae@intel.com
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 7c7824ae7862..dc6d5e98d296 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -1639,7 +1639,7 @@ static int __xstate_request_perm(u64 permitted, u64 requested, bool guest)
perm = guest ? &fpu->guest_perm : &fpu->perm;
/* Pairs with the READ_ONCE() in xstate_get_group_perm() */
- WRITE_ONCE(perm->__state_perm, requested);
+ WRITE_ONCE(perm->__state_perm, mask);
/* Protected by sighand lock */
perm->__state_size = ksize;
perm->__user_state_size = usize;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH][Rebased for 5.16] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation
2022-04-04 7:40 FAILED: patch "[PATCH] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation" failed to apply to 5.16-stable tree gregkh
@ 2022-04-05 11:04 ` Chang S. Bae
2022-04-11 13:28 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Chang S. Bae @ 2022-04-05 11:04 UTC (permalink / raw)
To: stable, gregkh; +Cc: yang.zhong, bonzini, tglx, linux-kernel, chang.seok.bae
From: Yang Zhong <yang.zhong@intel.com>
This is backport for 5.16
Upstream commit 063452fd94d153d4eb38ad58f210f3d37a09cca4
ARCH_REQ_XCOMP_PERM is supposed to add the requested feature to the
permission bitmap of thread_group_leader()->fpu. But the code overwrites
the bitmap with the requested feature bit only rather than adding it.
Fix the code to add the requested feature bit to the master bitmask.
Fixes: db8268df0983 ("x86/arch_prctl: Add controls for dynamic XSTATE components")
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Paolo Bonzini <bonzini@gnu.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220129173647.27981-2-chang.seok.bae@intel.com
[chang: Backport for 5.16]
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
---
arch/x86/kernel/fpu/xstate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index d28829403ed0..fc1ab0116f4e 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -1626,7 +1626,7 @@ static int __xstate_request_perm(u64 permitted, u64 requested)
return ret;
/* Pairs with the READ_ONCE() in xstate_get_group_perm() */
- WRITE_ONCE(fpu->perm.__state_perm, requested);
+ WRITE_ONCE(fpu->perm.__state_perm, mask);
/* Protected by sighand lock */
fpu->perm.__state_size = ksize;
fpu->perm.__user_state_size = usize;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][Rebased for 5.16] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation
2022-04-05 11:04 ` [PATCH][Rebased for 5.16] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation Chang S. Bae
@ 2022-04-11 13:28 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2022-04-11 13:28 UTC (permalink / raw)
To: Chang S. Bae; +Cc: stable, yang.zhong, bonzini, tglx, linux-kernel
On Tue, Apr 05, 2022 at 04:04:56AM -0700, Chang S. Bae wrote:
> From: Yang Zhong <yang.zhong@intel.com>
>
> This is backport for 5.16
>
> Upstream commit 063452fd94d153d4eb38ad58f210f3d37a09cca4
>
> ARCH_REQ_XCOMP_PERM is supposed to add the requested feature to the
> permission bitmap of thread_group_leader()->fpu. But the code overwrites
> the bitmap with the requested feature bit only rather than adding it.
>
> Fix the code to add the requested feature bit to the master bitmask.
>
> Fixes: db8268df0983 ("x86/arch_prctl: Add controls for dynamic XSTATE components")
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Paolo Bonzini <bonzini@gnu.org>
> Cc: stable@vger.kernel.org
> Link: https://lore.kernel.org/r/20220129173647.27981-2-chang.seok.bae@intel.com
> [chang: Backport for 5.16]
> Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
> ---
> arch/x86/kernel/fpu/xstate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-11 13:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-04 7:40 FAILED: patch "[PATCH] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation" failed to apply to 5.16-stable tree gregkh
2022-04-05 11:04 ` [PATCH][Rebased for 5.16] x86/fpu/xstate: Fix the ARCH_REQ_XCOMP_PERM implementation Chang S. Bae
2022-04-11 13:28 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).