diff options
| author |   Yang Zhong <yang.zhong@intel.com> | 2022-01-29 09:36:46 -0800 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2022-03-23 21:28:34 +0100 |
| commit | 063452fd94d153d4eb38ad58f210f3d37a09cca4 (patch) | |
| tree | 58269e012e2756f43776a0e2b44d3076a7288635 /arch/x86/kernel | |
| parent | Merge tag 'folio-5.18b' of git://git.infradead.org/users/willy/pagecache (diff) | |
| download | wireguard-linux-063452fd94d153d4eb38ad58f210f3d37a09cca4.tar.xz wireguard-linux-063452fd94d153d4eb38ad58f210f3d37a09cca4.zip | |
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
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/fpu/xstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |