From owner-svn-src-head@FreeBSD.ORG Fri Jul 11 01:23:39 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DA00C8B; Fri, 11 Jul 2014 01:23:39 +0000 (UTC) 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 4B6EE2C33; Fri, 11 Jul 2014 01:23:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6B1NdJQ038295; Fri, 11 Jul 2014 01:23:39 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6B1Ndqh038294; Fri, 11 Jul 2014 01:23:39 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201407110123.s6B1Ndqh038294@svn.freebsd.org> From: Neel Natu Date: Fri, 11 Jul 2014 01:23:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268521 - 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.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 01:23:39 -0000 Author: neel Date: Fri Jul 11 01:23:38 2014 New Revision: 268521 URL: http://svnweb.freebsd.org/changeset/base/268521 Log: Use the correct offset when converting a logical address (segment:offset) to a linear address. 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 Jul 11 01:23:15 2014 (r268520) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Fri Jul 11 01:23:38 2014 (r268521) @@ -627,7 +627,7 @@ vie_calculate_gla(enum vm_cpu_mode cpu_m struct seg_desc *desc, uint64_t offset, int length, int addrsize, int prot, uint64_t *gla) { - uint64_t low_limit, high_limit, segbase; + uint64_t firstoff, low_limit, high_limit, segbase; int glasize, type; KASSERT(seg >= VM_REG_GUEST_ES && seg <= VM_REG_GUEST_GS, @@ -637,6 +637,7 @@ vie_calculate_gla(enum vm_cpu_mode cpu_m KASSERT((prot & ~(PROT_READ | PROT_WRITE)) == 0, ("%s: invalid prot %#x", __func__, prot)); + firstoff = offset; if (cpu_mode == CPU_MODE_64BIT) { KASSERT(addrsize == 4 || addrsize == 8, ("%s: invalid address " "size %d for cpu_mode %d", __func__, addrsize, cpu_mode)); @@ -722,11 +723,11 @@ vie_calculate_gla(enum vm_cpu_mode cpu_m } /* - * Truncate 'offset' to the effective address size before adding + * Truncate 'firstoff' to the effective address size before adding * it to the segment base. */ - offset &= vie_size2mask(addrsize); - *gla = (segbase + offset) & vie_size2mask(glasize); + firstoff &= vie_size2mask(addrsize); + *gla = (segbase + firstoff) & vie_size2mask(glasize); return (0); }