From patchwork Fri Dec 18 10:50:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaitong Han X-Patchwork-Id: 7882101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CA4BB9F387 for ; Fri, 18 Dec 2015 10:52:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E1AC204B0 for ; Fri, 18 Dec 2015 10:52:22 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30DCC204AF for ; Fri, 18 Dec 2015 10:52:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9scC-0005cm-Ga; Fri, 18 Dec 2015 10:50:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9scA-0005cS-R2 for xen-devel@lists.xen.org; Fri, 18 Dec 2015 10:50:22 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 2A/59-02940-EE4E3765; Fri, 18 Dec 2015 10:50:22 +0000 X-Env-Sender: huaitong.han@intel.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450435820!11021939!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42423 invoked from network); 18 Dec 2015 10:50:21 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-13.tower-31.messagelabs.com with SMTP; 18 Dec 2015 10:50:21 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP; 18 Dec 2015 02:50:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,445,1444719600"; d="scan'208";a="15471695" Received: from huaitong-desk.bj.intel.com ([10.238.135.58]) by fmsmga004.fm.intel.com with ESMTP; 18 Dec 2015 02:50:18 -0800 From: Huaitong Han To: jbeulich@suse.com, andrew.cooper3@citrix.com, keir@xen.org Date: Fri, 18 Dec 2015 18:50:10 +0800 Message-Id: <1450435810-726-1-git-send-email-huaitong.han@intel.com> X-Mailer: git-send-email 2.4.3 Cc: Huaitong Han , shuai.ruan@linux.intel.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] x86/xsaves: get_xsave_addr needs check the xsave header X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The check needs to be against the xsave header in the area, rather than Xen's maximum xfeature_mask. A guest might easily have a smaller xcr0 than the maximum Xen is willing to allow, causing the pointer below to be bogus. Signed-off-by: Huaitong Han --- xen/arch/x86/xstate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b65da38..d87ab40 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -146,12 +146,13 @@ static void __init setup_xstate_comp(void) } } -static void *get_xsave_addr(void *xsave, unsigned int xfeature_idx) +static void *get_xsave_addr(struct xsave_struct *xsave, + unsigned int xfeature_idx) { - if ( !((1ul << xfeature_idx) & xfeature_mask) ) + if ( !((1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv) ) return NULL; - return xsave + xstate_comp_offsets[xfeature_idx]; + return (void *)xsave + xstate_comp_offsets[xfeature_idx]; } void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size)