Message ID | 58F5F17502000078001516E1@prv-mh.provo.novell.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <xen-devel-bounces@lists.xen.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EF56602C9 for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 09:01:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21B7B28236 for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 09:01:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1691F2838E; Tue, 18 Apr 2017 09:01:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 539D528236 for <patchwork-xen-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 09:01:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <xen-devel-bounces@lists.xen.org>) id 1d0OyU-0006Xb-IW; Tue, 18 Apr 2017 08:59:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <JBeulich@suse.com>) id 1d0OyS-0006XV-Q9 for xen-devel@lists.xenproject.org; Tue, 18 Apr 2017 08:59:00 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 35/BC-02183-455D5F85; Tue, 18 Apr 2017 08:59:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXS6fjDSzf46tc Ig927JCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1owHx46yFjwUr5h+4SR7A+NroS5GTg4hgTyJ p9uns4PYvAJ2Enc2PmIGsSUEDCWevr/OBmKzCKhKvHm1nQnEZhNQl2h7tp0VxBYR0JeY/+knm M0sUCdx9tpnsBphgSiJ2/cvA/VyAc0/wCQx5cJvsKGcQAt+TdoMtIwDaJmgxN8dwhC9WhIPf9 1igbC1JZYtfM0MUsIsIC2x/B/HBEa+WQgNs5A0zELSMAuhYQEjyypGjeLUorLUIl1DC72kosz 0jJLcxMwcXUMDU73c1OLixPTUnMSkYr3k/NxNjMDwYwCCHYxN2z0PMUpyMCmJ8v6y+BohxJeU n1KZkVicEV9UmpNafIhRhoNDSYJ30RWgnGBRanpqRVpmDjASYNISHDxKIrwdIGne4oLE3OLMd IjUKUZFKXHeTJCEAEgiozQPrg0WfZcYZaWEeRmBDhHiKUgtys0sQZV/xSjOwagkzKsEMoUnM6 8EbvoroMVMQIsjAr6ALC5JREhJNTCaLb1q/00qQn+pL5vNk4LdUjkL2ifMOGXu8t9rhUtnkPy eqS9e3Hkjm+r7XKe8809312TfA9Ot+7+xxORxX7klmth4IPeE9OEj6z5w/ZWxrao+dKJeSOdm /dmXB75arU3buvl4UpTy44yKwHIvpeWBfraZGnWVDz6dXuvlmMH65xlbC6/3lD4lluKMREMt5 qLiRABDi6ZJuQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1492505937!73195537!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17868 invoked from network); 18 Apr 2017 08:58:59 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 18 Apr 2017 08:58:59 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Tue, 18 Apr 2017 02:58:56 -0600 Message-Id: <58F5F17502000078001516E1@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Tue, 18 Apr 2017 02:59:01 -0600 From: "Jan Beulich" <JBeulich@suse.com> To: "Andrew Cooper" <andrew.cooper3@citrix.com> References: <58EFAA7F0200007800150CD0@prv-mh.provo.novell.com> <58EFAA7F0200007800150CD0@prv-mh.provo.novell.com> <58EFACA10200007800150CF9@prv-mh.provo.novell.com> <9d4bb603-04ec-0d33-9be1-59cfe8a5913d@citrix.com> <58EFB5410200007800150D99@prv-mh.provo.novell.com> <29f6de56-5025-705c-6ea8-69f40a6bf5be@citrix.com> In-Reply-To: <29f6de56-5025-705c-6ea8-69f40a6bf5be@citrix.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel <xen-devel@lists.xenproject.org>, Julien Grall <julien.grall@arm.com>, Adrian Pop <apop@bitdefender.com> Subject: Re: [Xen-devel] [PATCH 1/3] x86/HVM: restrict emulation in hvm_descriptor_access_intercept() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion <xen-devel.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe> List-Post: <mailto:xen-devel@lists.xen.org> List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org> X-Virus-Scanned: ClamAV using ClamSMTP |
--- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -8017,8 +8017,14 @@ x86_insn_modrm(const struct x86_emulate_ { check_state(state); - if ( state->modrm_mod > 3 ) + if ( unlikely(state->modrm_mod > 3) ) + { + if ( rm ) + *rm = ~0U; + if ( reg ) + *reg = ~0U; return -EINVAL; + } if ( rm ) *rm = state->modrm_rm;