From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030930AbcGKQNy (ORCPT ); Mon, 11 Jul 2016 12:13:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50208 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030843AbcGKQNw (ORCPT ); Mon, 11 Jul 2016 12:13:52 -0400 Date: Mon, 11 Jul 2016 09:13:22 -0700 From: tip-bot for Yu-cheng Yu Message-ID: Cc: yu-cheng.yu@intel.com, h.peter.anvin@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org, fenghua.yu@intel.com, mingo@kernel.org, ravi.v.shankar@intel.com, dave.hansen@intel.com Reply-To: dave.hansen@intel.com, ravi.v.shankar@intel.com, fenghua.yu@intel.com, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, h.peter.anvin@intel.com, yu-cheng.yu@intel.com, tglx@linutronix.de In-Reply-To: <1468253937-40008-3-git-send-email-fenghua.yu@intel.com> References: <1468253937-40008-3-git-send-email-fenghua.yu@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu/xstate: Return NULL for disabled xstate component address Git-Commit-ID: 5060b91513b866f774da15dfd82157864c4b1683 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5060b91513b866f774da15dfd82157864c4b1683 Gitweb: http://git.kernel.org/tip/5060b91513b866f774da15dfd82157864c4b1683 Author: Yu-cheng Yu AuthorDate: Mon, 11 Jul 2016 09:18:55 -0700 Committer: Ingo Molnar CommitDate: Mon, 11 Jul 2016 16:44:00 +0200 x86/fpu/xstate: Return NULL for disabled xstate component address 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 Signed-off-by: Fenghua Yu Reviewed-by: Dave Hansen Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ravi V Shankar Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1468253937-40008-3-git-send-email-fenghua.yu@intel.com Signed-off-by: Ingo Molnar --- 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 f8d1aff..4fb8dd7 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -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]; } /*