From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2245arUJFIOWjrAohzyVC/2EjneJnL6E1VfwBvSrnQSJC7HdNJ/pOqbK4dWrzR+kXD2KMYbs ARC-Seal: i=1; a=rsa-sha256; t=1516876744; cv=none; d=google.com; s=arc-20160816; b=JrEioHaLqHl184sC2XXBe6L/021yqU9QfDSNppjaUmJ6YyOdZF4LTf3KMg/YQ0FYi4 jFzCwr4W1O6vTLOP6Lx5jm9V7dn/Kh5hTNpTO5fF1B767K66jRaWPZywIFrrqvpRezZ1 yFh8bPv6wFQSrYDyh8Zql0kZlatVg4SrB8NJDQ41tpJHfAUOMox/WjHhrTPOoIZzuxkg 8lP9iJuv+DuaD93lZ9Dtexexpr+98zvX8bon+P0bJKbhAiJJfFj/q0Oi6fmK4jZrpH+s D5KRoFUhj+qkaIHIWS8WFnR1SIGwwYYDHJjeHiZ+9pHFHsSn/zaMBqBKX2mdV7pGSwxN xSfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=precedence:content-disposition:content-transfer-encoding :mime-version:robot-unsubscribe:robot-id:git-commit-id:subject:to :references:in-reply-to:reply-to:cc:message-id:from:sender:date :arc-authentication-results; bh=tVOXVhiS6vSwkTTwcN6Kcrd2yFXe6pwQUoAAJsDzJVs=; b=eeS8QZxq9h+X7/ffqZcHw2GhYoyjslckDCVhuujzBAc/lsWWJgZjvlrxJr+N9I6HD6 4jozWvuOm44AmjFJlZSQNFNeqZoy8PVoEV0Sd88C2ZflVGpUnRIzZkIdAJfqyqoyVXSk M5Zm/lojMHM9jK4SrVZnc/wMxmtQ9oIjfQ0E+0n3KvtTcNKdRyii/GAdYJYE0UfghV8u eYkn8ykFgfJrvlzJwM+uX/leFeE8Exwwa521oTwrlKWLzKogtcG2QTe3ZRS1mLz9LYSP msqJgZIeqwcHVmDRY1gjyIMi5x/KerySwEBNiz2m7nLxIaFJ5UcHld+tM0RvYF6JigBZ YVdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Date: Thu, 25 Jan 2018 02:34:37 -0800 Sender: tip tree robot From: tip-bot for Peter Zijlstra Message-ID: Cc: mingo@kernel.org, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, jbaron@akamai.com, peterz@infradead.org, ashok.raj@intel.com, arjan.van.de.ven@intel.com, dwmw@amazon.co.uk, dan.j.williams@intel.com, hpa@zytor.com, jpoimboe@redhat.com, asit.k.mallick@intel.com, dwmw2@infradead.org, luto@kernel.org, pbonzini@redhat.com, tglx@linutronix.de, tim.c.chen@linux.intel.com, dave.hansen@intel.com, ak@linux.intel.com, aarcange@redhat.com, jun.nakajima@intel.com Reply-To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, mingo@kernel.org, asit.k.mallick@intel.com, jpoimboe@redhat.com, hpa@zytor.com, dwmw@amazon.co.uk, dan.j.williams@intel.com, arjan.van.de.ven@intel.com, ashok.raj@intel.com, peterz@infradead.org, jbaron@akamai.com, pbonzini@redhat.com, luto@kernel.org, dwmw2@infradead.org, jun.nakajima@intel.com, aarcange@redhat.com, ak@linux.intel.com, dave.hansen@intel.com, tim.c.chen@linux.intel.com, tglx@linutronix.de In-Reply-To: <20180125095843.645776917@infradead.org> References: <20180125095843.645776917@infradead.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] KVM: VMX: Make indirect call specualation safe Git-Commit-ID: 34cc5034b57b81f789ad4714533ca921a9b1c9d7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590560548914608100?= X-GMAIL-MSGID: =?utf-8?q?1590560548914608100?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Commit-ID: 34cc5034b57b81f789ad4714533ca921a9b1c9d7 Gitweb: https://git.kernel.org/tip/34cc5034b57b81f789ad4714533ca921a9b1c9d7 Author: Peter Zijlstra AuthorDate: Thu, 25 Jan 2018 10:58:14 +0100 Committer: Thomas Gleixner CommitDate: Thu, 25 Jan 2018 11:30:07 +0100 KVM: VMX: Make indirect call specualation safe Replace indirect call with CALL_NOSPEC. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Reviewed-by: David Woodhouse Cc: Andrea Arcangeli Cc: Andi Kleen Cc: Ashok Raj Cc: Greg KH Cc: Jun Nakajima Cc: David Woodhouse Cc: Linus Torvalds Cc: rga@amazon.de Cc: Dave Hansen Cc: Asit Mallick Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: Jason Baron Cc: Paolo Bonzini Cc: Dan Williams Cc: Arjan Van De Ven Cc: Tim Chen Link: https://lkml.kernel.org/r/20180125095843.645776917@infradead.org --- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index d1e25db..924589c 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9064,14 +9064,14 @@ static void vmx_handle_external_intr(struct kvm_vcpu *vcpu) #endif "pushf\n\t" __ASM_SIZE(push) " $%c[cs]\n\t" - "call *%[entry]\n\t" + CALL_NOSPEC : #ifdef CONFIG_X86_64 [sp]"=&r"(tmp), #endif ASM_CALL_CONSTRAINT : - [entry]"r"(entry), + THUNK_TARGET(entry), [ss]"i"(__KERNEL_DS), [cs]"i"(__KERNEL_CS) );