On 09/08/2017 09:49 AM, Eric Biggers wrote:
> diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c
> index b188b16841e3..718b791bc037 100644
> --- a/arch/x86/kernel/fpu/regset.c
> +++ b/arch/x86/kernel/fpu/regset.c
> @@ -131,11 +131,15 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
>
> fpu__activate_fpstate_write(fpu);
>
> - if (boot_cpu_has(X86_FEATURE_XSAVES))
> + if (boot_cpu_has(X86_FEATURE_XSAVES)) {
> ret = copyin_to_xsaves(kbuf, ubuf, xsave);
> - else
> + } else {
> ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, xsave, 0, -1);
>
> + /* xcomp_bv must be zero when using uncompacted format */
> + xsave->header.xcomp_bv = 0;
> + }
Thanks for finding this!
I wonder if just writing over the user arguments is the right thing
here. It's quite conceivable that userspace has a *real* compacted
(XSAVEC-generated) buffer. Doing this could still end up corrupting data.
I think we probably (re?) define NT_X86_XSTATE as being for uncompacted
state only. Then, return an error back to userspace to tell them they
tried to do something we can't support.
We might even want to check all the reserved bits in the uncompacted
XSAVE header and enforce that they come in as zero.