From patchwork Thu Dec 25 00:52:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 5540691 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 84269BEEA8 for ; Thu, 25 Dec 2014 00:53:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD8EC201C8 for ; Thu, 25 Dec 2014 00:53:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA52C2012D for ; Thu, 25 Dec 2014 00:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752013AbaLYAxB (ORCPT ); Wed, 24 Dec 2014 19:53:01 -0500 Received: from mailgw10.technion.ac.il ([132.68.225.10]:30213 "EHLO mailgw10.technion.ac.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbaLYAw6 (ORCPT ); Wed, 24 Dec 2014 19:52:58 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApUBAJVem1SERCABjGdsb2JhbABchDDMSQKBEBYBAQEBAQEQAQEBJ0KEDQEFJ1IQQBFXGYgsw3mERAEBAQEGAgEfjw5kBxaEEwWgb4dphBJtgQOBQAEBAQ X-IPAS-Result: ApUBAJVem1SERCABjGdsb2JhbABchDDMSQKBEBYBAQEBAQEQAQEBJ0KEDQEFJ1IQQBFXGYgsw3mERAEBAQEGAgEfjw5kBxaEEwWgb4dphBJtgQOBQAEBAQ X-IronPort-AV: E=Sophos;i="5.07,640,1413234000"; d="scan'208";a="3010332" Received: from csa.cs.technion.ac.il ([132.68.32.1]) by mailgw10.technion.ac.il with ESMTP; 25 Dec 2014 02:52:53 +0200 Received: from csn.cs.technion.ac.il (csn.cs.technion.ac.il [132.68.32.15]) by csa.cs.technion.ac.il (Postfix) with ESMTP id 8CC5214004B; Thu, 25 Dec 2014 02:52:51 +0200 (IST) Received: from csl-tapuz20.cs.technion.ac.il (csl-tapuz20.cs.technion.ac.il [132.68.206.58]) by csn.cs.technion.ac.il (Postfix) with ESMTPSA id 635C7A1CC0; Thu, 25 Dec 2014 02:52:51 +0200 (IST) From: Nadav Amit To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, Nadav Amit Subject: [PATCH 5/8] KVM: x86: em_call_far should return failure result Date: Thu, 25 Dec 2014 02:52:20 +0200 Message-Id: <1419468743-23732-6-git-send-email-namit@cs.technion.ac.il> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1419468743-23732-1-git-send-email-namit@cs.technion.ac.il> References: <1419468743-23732-1-git-send-email-namit@cs.technion.ac.il> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, if em_call_far fails it returns success instead of the resulting error-code. Fix it. Signed-off-by: Nadav Amit --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index fd89471..7f80f01 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3034,7 +3034,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) rc = __load_segment_descriptor(ctxt, sel, VCPU_SREG_CS, cpl, X86_TRANSFER_CALL_JMP, &new_desc); if (rc != X86EMUL_CONTINUE) - return X86EMUL_CONTINUE; + return rc; rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc); if (rc != X86EMUL_CONTINUE)