From owner-svn-src-head@FreeBSD.ORG  Fri Jun  5 21:22:27 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4C4CC6FC;
 Fri,  5 Jun 2015 21:22:27 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B2071530;
 Fri,  5 Jun 2015 21:22:27 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t55LMRfT056331;
 Fri, 5 Jun 2015 21:22:27 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t55LMR7u056330;
 Fri, 5 Jun 2015 21:22:27 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201506052122.t55LMR7u056330@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
 using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 5 Jun 2015 21:22:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284046 - head/sys/amd64/vmm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jun 2015 21:22:27 -0000

Author: neel
Date: Fri Jun  5 21:22:26 2015
New Revision: 284046
URL: https://svnweb.freebsd.org/changeset/base/284046

Log:
  The 'verify_gla()' function is used to ensure that the effective address
  after decoding the instruction matches the one provided by hardware.
  
  Prior to r283293 'vie->num_valid' used to contain the actual length of
  the instruction whereas now it contains the maximum instruction length
  possible. This introduced a bug when calculating a RIP-relative base address.
  
  Fix this by using 'vie->num_processed' rather than 'vie->num_valid' as the
  length of the emulated instruction.
  
  Reported and tested by:	tychon
  MFC after:	1 week

Modified:
  head/sys/amd64/vmm/vmm_instruction_emul.c

Modified: head/sys/amd64/vmm/vmm_instruction_emul.c
==============================================================================
--- head/sys/amd64/vmm/vmm_instruction_emul.c	Fri Jun  5 20:38:22 2015	(r284045)
+++ head/sys/amd64/vmm/vmm_instruction_emul.c	Fri Jun  5 21:22:26 2015	(r284046)
@@ -2342,7 +2342,7 @@ verify_gla(struct vm *vm, int cpuid, uin
 		 * instruction
 		 */
 		if (vie->base_register == VM_REG_GUEST_RIP)
-			base += vie->num_valid;
+			base += vie->num_processed;
 	}
 
 	idx = 0;