From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-620147-1519836918-2-8962311459533895493 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='uk', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1519836917; b=PTw5jEy1hT+geTbnhq87uVZTGqM58Z9lzG3EcrwxSc9SdN1 pnVK8OiCWF29n7d87mjq8B/G9iAIoUGLgMJubuUpACnS095/xdKacNNdZeqoBtn7 0a/3iSF5Vkj4AGRJnYxRUnpycW5levfhS4pb4nS4gM6lAXxOhlUT2XMYMD1xWl63 xoqJvffAIFfwir2OSxsEK9c/E3lFO4AbMJAXCPMFEKuFI6zXXTcYw82EMqdKHeVH rVNxb2V6jrxaK+oV0iRWsXsmgx51IIJslqw2n4PiXYlJt6saoDFIUrxCjReu/Z90 r3BiiM652C+Rhi5qWf+2FSwVk/pIgU/7xBjjJzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:content-transfer-encoding :mime-version:from:to:cc:date:message-id:subject:in-reply-to :sender:list-id; s=arctest; t=1519836917; bh=r3sL36wFCnzPXCtW5cw huUw+PAQZnKnqXh70oM07LW8=; b=BEYsryu93d+2hDbme1kc8NuKX3jwvNgaTsW 5pNTjM/osPy7C1JRD0N+BvT3Hd18lqmjVunYO+VKRWUqKFlzewBLcVSYcaYv0+9E 6/zHaBI2+yeOBqGiDYy+QlBN71TyXDNNqnbarGjOCmX6dexVy3nId4N3HicoyvLn Mu44seZuFLxbUuyqZKRPN5yEpZMU2FWBcRRdeb8lmE8LLjz5bJZ6sEIfizEUbfds 86s9lqgga9KWlyyHpOXOAXeFWNHflaL28FSNPIvajeKarZNKznOv2+4G64o0Xcnb pGL9EjkBUDBSqQoWQi8ObYy+3qZHgmLaMkqSfc3FIMhZ3EnNEXw== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=decadent.org.uk; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=decadent.org.uk header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=decadent.org.uk; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=decadent.org.uk header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528AbeB1Qyd (ORCPT ); Wed, 28 Feb 2018 11:54:33 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34519 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934092AbeB1P5k (ORCPT ); Wed, 28 Feb 2018 10:57:40 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Jim Mattson" , "Andrew Honig" , "Paolo Bonzini" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 202/254] KVM: x86: Add memory barrier on vmcs field lookup In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Honig commit 75f139aaf896d6fdeec2e468ddfa4b2fe469bf40 upstream. This adds a memory barrier when performing a lookup into the vmcs_field_to_offset_table. This is related to CVE-2017-5753. Signed-off-by: Andrew Honig Reviewed-by: Jim Mattson Signed-off-by: Paolo Bonzini [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings --- --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -698,8 +698,18 @@ static const int max_vmcs_field = ARRAY_ static inline short vmcs_field_to_offset(unsigned long field) { - if (field >= max_vmcs_field || vmcs_field_to_offset_table[field] == 0) + if (field >= max_vmcs_field) return -1; + + /* + * FIXME: Mitigation for CVE-2017-5753. To be replaced with a + * generic mechanism. + */ + asm("lfence"); + + if (vmcs_field_to_offset_table[field] == 0) + return -1; + return vmcs_field_to_offset_table[field]; }