From aa831262c8160c7c38660852df8d03fc19a966b8 Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Sun, 2 Sep 2012 23:31:44 +0200 Subject: [PATCH] --- yaml --- r: 323977 b: refs/heads/master c: 5c7d03e99cb1ed449328ed9fba0c632944d39e7e h: refs/heads/master i: 323975: 20e4e0fe132b65b582aed63b1347b7d754a725b1 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/xsave.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f770d793875a..6544fce0a6ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04d695a6828bca54d53305246545cd1f8a841ac6 +refs/heads/master: 5c7d03e99cb1ed449328ed9fba0c632944d39e7e diff --git a/trunk/arch/x86/kernel/xsave.c b/trunk/arch/x86/kernel/xsave.c index 3d3e20709119..9e1a8a7ba6e6 100644 --- a/trunk/arch/x86/kernel/xsave.c +++ b/trunk/arch/x86/kernel/xsave.c @@ -132,9 +132,9 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf, fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; - err = __get_user(magic2, (__u32 *) (((void *)fpstate) + - fx_sw_user->extended_size - - FP_XSTATE_MAGIC2_SIZE)); + err = __get_user(magic2, (__u32 __user *) (fpstate + + fx_sw_user->extended_size - + FP_XSTATE_MAGIC2_SIZE)); if (err) return err; /*