OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/fpu: Use validate_xstate_header() to validate the xstate_header in copy_user_to_xstate() 

Tighten the checks in copy_user_to_xstate().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Eric Biggers <ebiggers3@gmail.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kevin Hao <haokexin@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Halcrow <mhalcrow@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Cc: kernel-hardening@lists.openwall.com
Link: http://lkml.kernel.org/r/20170924105913.9157-10-mingo@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Eric Biggers 2017-09-24 12:59:12 +02:00 committed by Ingo Molnar
parent 3d703477bc
commit 98c0fad9d6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/fpu/xstate.c
View File

@ -1188,16 +1188,15 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf)
} }
/* /*
* Convert from a ptrace standard-format user-space buffer to kernel XSAVES format * Convert from a ptrace or sigreturn standard-format user-space buffer to
* and copy to the target thread. This is called from xstateregs_set() and * kernel XSAVES format and copy to the target thread. This is called from
* there we check the CPU has XSAVES and a whole standard-sized buffer * xstateregs_set(), as well as potentially from the sigreturn() and
* exists. * rt_sigreturn() system calls.
*/ */
int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf) int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
{ {
unsigned int offset, size; unsigned int offset, size;
int i; int i;
u64 allowed_features;
struct xstate_header hdr; struct xstate_header hdr;
offset = offsetof(struct xregs_state, header); offset = offsetof(struct xregs_state, header);
@ -1206,12 +1205,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
if (__copy_from_user(&hdr, ubuf + offset, size)) if (__copy_from_user(&hdr, ubuf + offset, size))
return -EFAULT; return -EFAULT;
/* if (validate_xstate_header(&hdr))
* Reject if the user sets any disabled or supervisor features:
*/
allowed_features = xfeatures_mask & ~XFEATURE_MASK_SUPERVISOR;
if (hdr.xfeatures & ~allowed_features)
return -EINVAL; return -EINVAL;
for (i = 0; i < XFEATURE_MAX; i++) { for (i = 0; i < XFEATURE_MAX; i++) {