Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / x86 / kvm / pmu_intel.c

diff --git a/arch/x86/kvm/pmu_intel.c b/arch/x86/kvm/pmu_intel.c
index 8fc07ea..822829f 100644 (file)
--- a/arch/x86/kvm/pmu_intel.c
+++ b/arch/x86/kvm/pmu_intel.c
@@ -87,10 +87,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 comparising it with globl_ctrl bits. */
@@ -131,15 +135,19 @@ static struct kvm_pmc *intel_msr_idx_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;
-
-       return &counters[idx];
+       return &counters[array_index_nospec(idx, num_counters)];
 }
 
 static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)