From patchwork Sun Mar 14 16:20:57 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Gleb Natapov <gleb@redhat.com>
X-Patchwork-Id: 85819
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2EGLV3N019763
	for <patchwork-kvm@patchwork.kernel.org>;
	Sun, 14 Mar 2010 16:21:32 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1759422Ab0CNQV3 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Sun, 14 Mar 2010 12:21:29 -0400
Received: from mx1.redhat.com ([209.132.183.28]:6403 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754463Ab0CNQVT (ORCPT <rfc822;kvm@vger.kernel.org>);
	Sun, 14 Mar 2010 12:21:19 -0400
Received: from int-mx03.intmail.prod.int.phx2.redhat.com
	(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2EGLI6j010366
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Sun, 14 Mar 2010 12:21:19 -0400
Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com
	[10.35.1.237])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o2EGLH9Q018255; Sun, 14 Mar 2010 12:21:18 -0400
Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519)
	id 2521018D45F; Sun, 14 Mar 2010 18:21:16 +0200 (IST)
From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com, mtosatti@redhat.com
Cc: kvm@vger.kernel.org
Subject: [PATCH v2 12/30] KVM: x86 emulator: inject #UD on access to
	non-existing CR
Date: Sun, 14 Mar 2010 18:20:57 +0200
Message-Id: <1268583675-3101-13-git-send-email-gleb@redhat.com>
In-Reply-To: <1268583675-3101-1-git-send-email-gleb@redhat.com>
References: <1268583675-3101-1-git-send-email-gleb@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sun, 14 Mar 2010 16:21:32 +0000 (UTC)


diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index fa4604e..836e97b 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2520,6 +2520,13 @@ twobyte_insn:
 		c->dst.type = OP_NONE;
 		break;
 	case 0x20: /* mov cr, reg */
+		switch (c->modrm_reg) {
+		case 1:
+		case 5 ... 7:
+		case 9 ... 15:
+			kvm_queue_exception(ctxt->vcpu, UD_VECTOR);
+			goto done;
+		}
 		c->regs[c->modrm_rm] = ops->get_cr(c->modrm_reg, ctxt->vcpu);
 		c->dst.type = OP_NONE;	/* no writeback */
 		break;