]> git.karo-electronics.de Git - linux-beck.git/commitdiff
x86/fpu/xstate: Return NULL for disabled xstate component address
authorYu-cheng Yu <yu-cheng.yu@intel.com>
Mon, 11 Jul 2016 16:18:55 +0000 (09:18 -0700)
committerIngo Molnar <mingo@kernel.org>
Mon, 11 Jul 2016 14:44:00 +0000 (16:44 +0200)
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>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: H. Peter Anvin <h.peter.anvin@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi V Shankar <ravi.v.shankar@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1468253937-40008-3-git-send-email-fenghua.yu@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/fpu/xstate.c

index f8d1aff10f6904151e2049c8b9d2f4904ee9959f..4fb8dd7697c5e58c87408401166b91877df71ed7 100644 (file)
@@ -760,6 +760,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];
 }
 /*