x86: xsave: cleanup return codes in check_for_xstate()
Subsystems (2)
PATCH 1/1 x86: xsave: cleanup return codes in check_for_xstate()
The places which call check_for_xstate() only care about zero or non-zero so this patch doesn't change how the code runs, but it's a cleanup. The main reason for this patch is that I'm looking for places which don't return -EFAULT for copy_from_user() failures.
arch/x86/kernel/xsave.c +7 -6
@@ -36,15 +36,14 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf, err =__copy_from_user (fx_sw_user, &buf->sw_reserved[0 ],sizeof (struct _fpx_sw_bytes )); -if (err) -return err; +return -EFAULT ;/* * First Magic check failed. */ if (fx_sw_user->magic1 !=FP_XSTATE_MAGIC1 ) -return -1 ; +return -EINVAL ;/* * Check for error scenarios.
@@ -52,19 +51,21 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,if (fx_sw_user->xstate_size < min_xstate_size || fx_sw_user->xstate_size > xstate_size || fx_sw_user->xstate_size > fx_sw_user->extended_size) -return -1 ; +return -EINVAL ; err =__get_user (magic2, (__u32 *) (((void *)fpstate) + fx_sw_user->extended_size -FP_XSTATE_MAGIC2_SIZE )); +if (err) +return err;/* * Check for the presence of second magic word at the end of memory * layout. This detects the case where the user just copied the legacy * fpstate layout with out copying the extended state information * in the memory layout. */ -if (err || magic2 !=FP_XSTATE_MAGIC2 ) -return -1 ; +if (magic2 !=FP_XSTATE_MAGIC2 ) +return -EFAULT ;return 0 ; }
[tip:x86/cpu] x86, xsave: Cleanup return codes in check_for_xstate()
Commit-ID: d6d4d4205cf4ce4ba13bc320305afbda25303496 Gitweb: http://git.kernel.org/tip/d6d4d4205cf4ce4ba13bc320305afbda25303496 Author: Dan Carpenter <[email protected]> AuthorDate: Thu, 3 Jun 2010 12:07:46 +0200 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 9 Jun 2010 15:57:36 -0700
x86, xsave: Cleanup return codes in check_for_xstate()
The places which call check_for_xstate() only care about zero or non-zero so this patch doesn't change how the code runs, but it's a cleanup. The main reason for this patch is that I'm looking for places which don't return -EFAULT for copy_from_user() failures.
LKML-Reference: <20100603100746.GU5483@bicker>
--- arch/x86/kernel/xsave.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
arch/x86/kernel/xsave.c +7 -6
@@ -36,15 +36,14 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf, err =__copy_from_user (fx_sw_user, &buf->sw_reserved[0 ],sizeof (struct _fpx_sw_bytes )); -if (err) -return err; +return -EFAULT ;/* * First Magic check failed. */ if (fx_sw_user->magic1 !=FP_XSTATE_MAGIC1 ) -return -1 ; +return -EINVAL ;/* * Check for error scenarios.
@@ -52,19 +51,21 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,if (fx_sw_user->xstate_size < min_xstate_size || fx_sw_user->xstate_size > xstate_size || fx_sw_user->xstate_size > fx_sw_user->extended_size) -return -1 ; +return -EINVAL ; err =__get_user (magic2, (__u32 *) (((void *)fpstate) + fx_sw_user->extended_size -FP_XSTATE_MAGIC2_SIZE )); +if (err) +return err;/* * Check for the presence of second magic word at the end of memory * layout. This detects the case where the user just copied the legacy * fpstate layout with out copying the extended state information * in the memory layout. */ -if (err || magic2 !=FP_XSTATE_MAGIC2 ) -return -1 ; +if (magic2 !=FP_XSTATE_MAGIC2 ) +return -EFAULT ;return 0 ; }