From patchwork Thu Mar 22 08:34:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 10300967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EEAC3600CC for ; Thu, 22 Mar 2018 08:34:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1BD829A7A for ; Thu, 22 Mar 2018 08:34:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D639429AC3; Thu, 22 Mar 2018 08:34:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A9FA29A7A for ; Thu, 22 Mar 2018 08:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752739AbeCVIeS (ORCPT ); Thu, 22 Mar 2018 04:34:18 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40631 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbeCVIeQ (ORCPT ); Thu, 22 Mar 2018 04:34:16 -0400 Received: by mail-pl0-f65.google.com with SMTP id x4-v6so4839773pln.7; Thu, 22 Mar 2018 01:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QCdjPvizCplOWLwLAgV5rC5Xyo/BXNECI8hZTKYvyvQ=; b=qWSci1KsPzK0igKe9pDyfEdPPw6QATq9AMhd5cXaZR3QL5YhBV4cZJ6/uiQWwKp5nN KJrLTHlyccgZkuJUxadM0wvSqhw0jyIhY6EE/4RJIRrLblk0v5JMCnzPemdWRJLtpQRy BZEdM9n3fFPMvLmWKStfKLsD/55j+/H3zgX+UAgUucbks0oS2/Wv3K5fngsM7OZ+uRED OHFmXOLU4IGWWRWR8H1KXWAXUXIkNCJDPh1laSCVi2UkPdudlXWGQs+2O7KndQjSK5aY ub+kICvMJAVKgRo2o7g+cl36Ss1jk4FV8ukHdU04fJrHONfhi8RIBVk9AoHgcaAM6yFg DA0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QCdjPvizCplOWLwLAgV5rC5Xyo/BXNECI8hZTKYvyvQ=; b=ESAgt6KT9zNVrwq2NvxbpQC/ORj6W1JY/drNmCk5I3CT8qSciAlvCTzVknfiJtlPDe DAA1OeZ14I11ef87L8sY+X7I/uFdzHwY1m51SHo7hqhbCQYDK3W13niWpITt3UqIuue8 JS3d4ntIrIcRpMjZTFUFnqH+ZPH0wHQyTMOBLGQlIxlkLS2OWXa9a2lP59NXoYwfCiYw MCKEp88HnrrFK1dONdz5xv4Rcfia9it4GWFWUGPZBI/Ac412fNNc1SUENGcihVHvJAKS gt5gsoC5S+p/QMObAq6u4WcsjWeJF3H66v5skZev1pNL7cppS6YBw8qUl4unlTJKYiZX HEgw== X-Gm-Message-State: AElRT7FQSbuL6drJby4cl2hMd8UQ6MxrYYvTNR4W6tllVlyvwsvUmVs1 M7tDXiYzV5DDc22JFyuSi2nz+A== X-Google-Smtp-Source: AG47ELsUGP3umth8CSZf7McefXooCWdgAWjJ2jsKJ23t0DdBF8CAI2yohtYHxX27af6vsl65vXCobA== X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr6463621plb.269.1521707656165; Thu, 22 Mar 2018 01:34:16 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id y14sm14203961pff.81.2018.03.22.01.34.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Mar 2018 01:34:15 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH] KVM: X86: Fix the decoding of segment overrides in 64bit mode Date: Thu, 22 Mar 2018 16:34:11 +0800 Message-Id: <1521707651-9375-1-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wanpeng Li Explicit segment overides other than %fs and %gs are documented as ignored by both Intel and AMD. In practice, this means that: * Explicit uses of %ss don't actually yield #SS[0] for non-canonical memory references. * Explicit uses of %{e,c,d}s don't override %rbp/%rsp-based memory references to yield #GP[0] for non-canonical memory references. Cc: Paolo Bonzini Cc: Radim Krčmář Signed-off-by: Wanpeng Li --- arch/x86/kvm/emulate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index dd88158..5091255 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -5148,8 +5148,10 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) case 0x2e: /* CS override */ case 0x36: /* SS override */ case 0x3e: /* DS override */ - has_seg_override = true; - ctxt->seg_override = (ctxt->b >> 3) & 3; + if (mode != X86EMUL_MODE_PROT64) { + has_seg_override = true; + ctxt->seg_override = (ctxt->b >> 3) & 3; + } break; case 0x64: /* FS override */ case 0x65: /* GS override */