From patchwork Mon May 10 15:51:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Gamal X-Patchwork-Id: 98190 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 o4AFpfMQ013251 for ; Mon, 10 May 2010 15:52:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753483Ab0EJPvj (ORCPT ); Mon, 10 May 2010 11:51:39 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]:36335 "EHLO mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753195Ab0EJPvj (ORCPT ); Mon, 10 May 2010 11:51:39 -0400 Received: by wwa36 with SMTP id 36so1677028wwa.19 for ; Mon, 10 May 2010 08:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=xuM2tpiXPgiJhcNarl+EgPGibHGtgNhglK+6YMqI9pw=; b=cesfes055p9JVlseIL7RkG0pFRbKKclSpP/wCxjm3aP5wf8o0Chc9ecwpyvuE2KE8G 0SipXJn2qVHPJKI7eyHXHiljIOeAcu8i64cAruPNLg0ISnFJNQpokEGgIm+5D4XrJBKI KTCAtBTcctXXdV4XuTHXkU/JxUf8cee0KsWuU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Si37tKN9cyAmrALkG9AXWGq1glS7chJV+hQGwnK5T7ES531CTFXJQkT8jVZgovDV15 HrlSpe88W+vOftUXF6tvgKyddQoVZzuMMyX39ZioIz9dG2rApWgLQXxY08RDH0eRdlcV 6tydKVeYvkHtlwT7/Q51Lt7zv6x6ONIfA5dm8= Received: by 10.216.176.141 with SMTP id b13mr2583190wem.65.1273506697599; Mon, 10 May 2010 08:51:37 -0700 (PDT) Received: from localhost ([41.239.67.152]) by mx.google.com with ESMTPS id d75sm1690565wek.20.2010.05.10.08.51.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 10 May 2010 08:51:36 -0700 (PDT) From: Mohammed Gamal To: avi@redhat.com Cc: mtosatti@redhat.com, kvm@vger.kernel.org, Mohammed Gamal Subject: [PATCH] VMX: Invalid guest state detection enhancements and bug fixes Date: Mon, 10 May 2010 18:51:25 +0300 Message-Id: <1273506685-2153-1-git-send-email-m.gamal005@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Mon, 10 May 2010 15:52:41 +0000 (UTC) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 777e00d..968384b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2122,7 +2122,7 @@ static bool stack_segment_valid(struct kvm_vcpu *vcpu) ss_rpl = ss.selector & SELECTOR_RPL_MASK; if (ss.unusable) - return true; + return false; if (ss.type != 3 && ss.type != 7) return false; if (!ss.s) @@ -2144,7 +2144,7 @@ static bool data_segment_valid(struct kvm_vcpu *vcpu, int seg) rpl = var.selector & SELECTOR_RPL_MASK; if (var.unusable) - return true; + return false; if (!var.s) return false; if (!var.present) @@ -2185,7 +2185,7 @@ static bool ldtr_valid(struct kvm_vcpu *vcpu) vmx_get_segment(vcpu, &ldtr, VCPU_SREG_LDTR); if (ldtr.unusable) - return true; + return false; if (ldtr.selector & SELECTOR_TI_MASK) /* TI = 1 */ return false; if (ldtr.type != 2) @@ -2207,6 +2207,27 @@ static bool cs_ss_rpl_check(struct kvm_vcpu *vcpu) (ss.selector & SELECTOR_RPL_MASK)); } +static bool rflags_valid(struct kvm_vcpu *vcpu) +{ + unsigned long rflags; + u32 entry_intr_info; + + rflags = vmcs_readl(GUEST_RFLAGS); + entry_intr_info = vmcs_read32(VM_ENTRY_INTR_INFO_FIELD); +#ifdef CONFIG_X86_64 + if (is_long_mode(vcpu)) + if (rflags & X86_EFLAGS_VM) + return false; +#endif + if ((entry_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_EXT_INTR + && (entry_intr_info & INTR_INFO_VALID_MASK)) { + if (!(rflags & X86_EFLAGS_IF)) + return false; + } + + return true; +} + /* * Check if guest state is valid. Returns true if valid, false if * not. @@ -2251,8 +2272,9 @@ static bool guest_state_valid(struct kvm_vcpu *vcpu) } /* TODO: * - Add checks on RIP - * - Add checks on RFLAGS */ + if (!rflags_valid(vcpu)) + return false; return true; } @@ -3559,6 +3581,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) } if (err != EMULATE_DONE) { + kvm_report_emulation_failure(vcpu, "invalid guest state handler"); vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR; vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION; vcpu->run->internal.ndata = 0;