From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>,
Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [PATCH v7 11/13] x86/xsaves: When a disabled xstate component address is requested, return NULL
Date: Wed, 11 May 2016 12:51:14 -0700 [thread overview]
Message-ID: <1c13b1a7a5e8a305c96856f92d504222baa4d2eb.1462983817.git.yu-cheng.yu@intel.com> (raw)
In-Reply-To: <cover.1462983817.git.yu-cheng.yu@intel.com>
In-Reply-To: <cover.1462983817.git.yu-cheng.yu@intel.com>
It is an error to request a disabled XSAVE/XSAVES component address.
For that case, make __raw_xsave_addr() return a NULL and issue a
warning.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
---
arch/x86/kernel/fpu/xstate.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 27511bb..13c6fea 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -761,6 +761,11 @@ void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask)
{
int feature_nr = fls64(xstate_feature_mask) - 1;
+ if (!xfeature_enabled(feature_nr)) {
+ WARN_ON_FPU(1);
+ return NULL;
+ }
+
return (void *)xsave + xstate_comp_offsets[feature_nr];
}
--
1.9.1
next prev parent reply other threads:[~2016-05-11 19:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 19:51 [PATCH v7 00/13] x86/xsaves: Fix XSAVES issues Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 01/13] x86/xsaves: Define and use fpu_user_xstate_size Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 02/13] x86/xsaves: Rename xstate_size to fpu_kernel_xstate_size to distinguish from fpu_user_xstate_size Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 03/13] x86/xsaves: Keep init_fpstate.xsave.header.xfeatures as zero for init optimization Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 04/13] x86/xsaves: Introduce a new check that allows correct xstates copy from kernel to user directly Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 05/13] x86/xsaves: Align xstate components according to CPUID Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 06/13] x86/xsaves: Supervisor state component offset Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 07/13] x86/xsaves: Fix PTRACE frames for XSAVES Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 08/13] x86/xsaves: Fix XSTATE component offset print out Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 09/13] x86/xsaves: Fix xstate_offsets, xstate_sizes for non-extended states Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 10/13] x86/xsaves: Fix __fpu_restore_sig() for XSAVES Yu-cheng Yu
2016-05-11 19:51 ` Yu-cheng Yu [this message]
2016-05-11 19:51 ` [PATCH v7 12/13] x86/xsaves: Fix fpstate_init() for XRSTORS Yu-cheng Yu
2016-05-11 19:51 ` [PATCH v7 13/13] x86/xsaves: Re-enable XSAVES Yu-cheng Yu
2016-05-11 20:04 ` [PATCH v7 00/13] x86/xsaves: Fix XSAVES issues Borislav Petkov
2016-05-11 20:14 ` Dave Hansen
2016-05-11 20:34 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c13b1a7a5e8a305c96856f92d504222baa4d2eb.1462983817.git.yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=ravi.v.shankar@intel.com \
--cc=sai.praneeth.prakhya@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®