From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B49E6C2D0C7 for ; Wed, 11 Dec 2019 20:49:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 897392173E for ; Wed, 11 Dec 2019 20:49:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wOXGE1zi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727437AbfLKUtO (ORCPT ); Wed, 11 Dec 2019 15:49:14 -0500 Received: from mail-pj1-f73.google.com ([209.85.216.73]:40945 "EHLO mail-pj1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727388AbfLKUtO (ORCPT ); Wed, 11 Dec 2019 15:49:14 -0500 Received: by mail-pj1-f73.google.com with SMTP id x16so12156281pjq.7 for ; Wed, 11 Dec 2019 12:49:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=pF2WlIU/fL9uff7kBsgxTMqKCCrCXAxDkCSxpnWA8Hc=; b=wOXGE1ziHhMbTaWk5y905z7CmNYrHF2stLJ5nTSOyydpukAcfH2AGVCowdYSm4ypL0 64ZDkbUtjEle5f3WH546F616ttT1IhpXK8uXs27g2zqc6n2k5UGaltx8c+LdvGJk2wLB IsyfwA8Xf9K2vl+Gy7e5Ox29QiWDRXmIN5Zi0BnKHdD4doWO5yb5XAKXsqZGzrcxA9lv gn/TJstleJ0fjN83ur/dKMmGstvi3C9aSMFq7luP67J+ViXeL4QL26nRBY1EeutWcNUY /k86MW3ABKZuyJArYW2ng4RxiE6jy+xeHNBRYURrC70qcyTw2/zxjDul3ZwJoCqLessW Ub/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pF2WlIU/fL9uff7kBsgxTMqKCCrCXAxDkCSxpnWA8Hc=; b=hX49vZWNLdA2yHLa+ABxOdVkNo9gfCJ18Gv2PGeeB1piWdCMvYY8STIIIuSeMbo3Yd w8DYweFlIF+twnCIBpwekrkgyVguoE+vOsMsIROO2RNHm5uvBhCAsOp5Ey5Jv4QjbSlf JChaydSn9GOhzMgwGtV5aHp2/uG+xRF3uRrnOKEU3FBNT8U/I+PDadIXdg9suKnMb4BC ys/hCkg640hW82/QElnNt16Sh0Y4xHqDQ7kLfbCl+er6yU+5qlWdx5g90GXGdnjRBN1L 8FNA3nPum3+FOyEebMmPmqkGTSNT2+L4z5MYnVVz3RUIY/vNX1nEulrmOrqCgisYcYEr P0CQ== X-Gm-Message-State: APjAAAUtxJAtLF+/72n7AabOYtOTI0KZWOgsXD8Vu6+TDjY9dZ8WaVCE XcE24JiXLxTX+uwnUNfojzfTNKVpn+xa X-Google-Smtp-Source: APXvYqz7DGnJhK745r3i0eJnor21BV+iB+U1VIoblnM/Xj/Ff3DlAEHm++Y8oQpKEj9whBnf2R+gfdKZ59rw X-Received: by 2002:a63:6704:: with SMTP id b4mr6504163pgc.424.1576097353549; Wed, 11 Dec 2019 12:49:13 -0800 (PST) Date: Wed, 11 Dec 2019 12:47:53 -0800 In-Reply-To: <20191211204753.242298-1-pomonis@google.com> Message-Id: <20191211204753.242298-14-pomonis@google.com> Mime-Version: 1.0 References: <20191211204753.242298-1-pomonis@google.com> X-Mailer: git-send-email 2.24.0.525.g8f36a354ae-goog Subject: [PATCH v2 13/13] KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks From: Marios Pomonis To: Paolo Bonzini , rkrcmar@redhat.com, Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Finco , Andrew Honig , Marios Pomonis , stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This fixes Spectre-v1/L1TF vulnerabilities in intel_find_fixed_event() and intel_rdpmc_ecx_to_pmc(). kvm_rdpmc() (ancestor of intel_find_fixed_event()) and reprogram_fixed_counter() (ancestor of intel_rdpmc_ecx_to_pmc()) are exported symbols so KVM should treat them conservatively from a security perspective. Fixes: commit 25462f7f5295 ("KVM: x86/vPMU: Define kvm_pmu_ops to support vPMU function dispatch") Signed-off-by: Nick Finco Signed-off-by: Marios Pomonis Reviewed-by: Andrew Honig Cc: stable@vger.kernel.org --- arch/x86/kvm/vmx/pmu_intel.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 7023138b1cb0..34a3a17bb6d7 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -86,10 +86,14 @@ static unsigned intel_find_arch_event(struct kvm_pmu *pmu, static unsigned intel_find_fixed_event(int idx) { - if (idx >= ARRAY_SIZE(fixed_pmc_events)) + u32 event; + size_t size = ARRAY_SIZE(fixed_pmc_events); + + if (idx >= size) return PERF_COUNT_HW_MAX; - return intel_arch_events[fixed_pmc_events[idx]].event_type; + event = fixed_pmc_events[array_index_nospec(idx, size)]; + return intel_arch_events[event].event_type; } /* check if a PMC is enabled by comparing it with globl_ctrl bits. */ @@ -130,16 +134,20 @@ static struct kvm_pmc *intel_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu, struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); bool fixed = idx & (1u << 30); struct kvm_pmc *counters; + unsigned int num_counters; idx &= ~(3u << 30); - if (!fixed && idx >= pmu->nr_arch_gp_counters) - return NULL; - if (fixed && idx >= pmu->nr_arch_fixed_counters) + if (fixed) { + counters = pmu->fixed_counters; + num_counters = pmu->nr_arch_fixed_counters; + } else { + counters = pmu->gp_counters; + num_counters = pmu->nr_arch_gp_counters; + } + if (idx >= num_counters) return NULL; - counters = fixed ? pmu->fixed_counters : pmu->gp_counters; *mask &= pmu->counter_bitmask[fixed ? KVM_PMC_FIXED : KVM_PMC_GP]; - - return &counters[idx]; + return &counters[array_index_nospec(idx, num_counters)]; } static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr) -- 2.24.0.525.g8f36a354ae-goog