[tip:x86/cpu] x86, xsave: Cleanup return codes in check_for_xstate()
in [Kernel]
|
Prev: [tip:x86/cpu] x86, AMD: Extend support to future families
Next: Fix a race in pid generation that causes pids to be reused immediately.
From: tip-bot for Dan Carpenter on 9 Jun 2010 20:20 Commit-ID: d6d4d4205cf4ce4ba13bc320305afbda25303496 Gitweb: http://git.kernel.org/tip/d6d4d4205cf4ce4ba13bc320305afbda25303496 Author: Dan Carpenter <error27(a)gmail.com> AuthorDate: Thu, 3 Jun 2010 12:07:46 +0200 Committer: H. Peter Anvin <hpa(a)linux.intel.com> 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. Signed-off-by: Dan Carpenter <error27(a)gmail.com> LKML-Reference: <20100603100746.GU5483(a)bicker> Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com> Cc: Suresh Siddha <suresh.b.siddha(a)intel.com> --- arch/x86/kernel/xsave.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c index 37e68fc..9801498 100644 --- a/arch/x86/kernel/xsave.c +++ b/arch/x86/kernel/xsave.c @@ -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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |