diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-03-24 14:47:14 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-03-30 11:35:22 +0200 |
| commit | 781c64bfcb735960717d1cb45428047ff6a5030c (patch) | |
| tree | 82b9ea5f9e17f91eb8f9fe6334ae139daefbf69f /arch/x86 | |
| parent | x86/fpu/xsave: Handle compacted offsets correctly with supervisor states (diff) | |
| download | linux-781c64bfcb735960717d1cb45428047ff6a5030c.tar.xz linux-781c64bfcb735960717d1cb45428047ff6a5030c.zip | |
x86/fpu/xstate: Handle supervisor states in XSTATE permissions
The size calculation in __xstate_request_perm() fails to take supervisor
states into account because the permission bitmap is only relevant for user
states.
Up to 5.17 this does not matter because there are no supervisor states
supported, but the (re-)enabling of ENQCMD makes them available.
Fixes: 7c1ef59145f1 ("x86/cpufeatures: Re-enable ENQCMD")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220324134623.681768598@linutronix.de
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/fpu/xstate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index c55f72eb5466..5ac934b48d4a 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1571,6 +1571,9 @@ static int __xstate_request_perm(u64 permitted, u64 requested, bool guest) /* Calculate the resulting kernel state size */ mask = permitted | requested; + /* Take supervisor states into account on the host */ + if (!guest) + mask |= xfeatures_mask_supervisor(); ksize = xstate_calculate_size(mask, compacted); /* Calculate the resulting user state size */ |