Skip to content

Commit 484cea4

Browse files
KAGA-KOKOsuryasaimadhu
authored andcommitted
x86/fpu: Prevent state corruption in __fpu__restore_sig()
The non-compacted slowpath uses __copy_from_user() and copies the entire user buffer into the kernel buffer, verbatim. This means that the kernel buffer may now contain entirely invalid state on which XRSTOR will #GP. validate_user_xstate_header() can detect some of that corruption, but that leaves the onus on callers to clear the buffer. Prior to XSAVES support, it was possible just to reinitialize the buffer, completely, but with supervisor states that is not longer possible as the buffer clearing code split got it backwards. Fixing that is possible but not corrupting the state in the first place is more robust. Avoid corruption of the kernel XSAVE buffer by using copy_user_to_xstate() which validates the XSAVE header contents before copying the actual states to the kernel. copy_user_to_xstate() was previously only called for compacted-format kernel buffers, but it works for both compacted and non-compacted forms. Using it for the non-compacted form is slower because of multiple __copy_from_user() operations, but that cost is less important than robust code in an already slow path. [ Changelog polished by Dave Hansen ] Fixes: b860eb8 ("x86/fpu/xstate: Define new functions for clearing fpregs and xstates") Reported-by: [email protected] Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Acked-by: Dave Hansen <[email protected]> Acked-by: Rik van Riel <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent 8d651ee commit 484cea4

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

arch/x86/kernel/fpu/signal.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
405405
if (use_xsave() && !fx_only) {
406406
u64 init_bv = xfeatures_mask_user() & ~user_xfeatures;
407407

408-
if (using_compacted_format()) {
409-
ret = copy_user_to_xstate(&fpu->state.xsave, buf_fx);
410-
} else {
411-
ret = __copy_from_user(&fpu->state.xsave, buf_fx, state_size);
412-
413-
if (!ret && state_size > offsetof(struct xregs_state, header))
414-
ret = validate_user_xstate_header(&fpu->state.xsave.header);
415-
}
408+
ret = copy_user_to_xstate(&fpu->state.xsave, buf_fx);
416409
if (ret)
417410
goto err_out;
418411

0 commit comments

Comments
 (0)