[PATCH v2 2/2] x86/kvm/hyper-v: disallow setting illegal vectors for direct mode stimers

From: Vitaly Kuznetsov
Date: Wed Dec 12 2018 - 11:50:28 EST


APIC vectors used for direct mode stimers should be valid for lAPIC and
just like genuine Hyper-V we should #GP when an illegal one is specified.

Add the appropriate check to stimer_set_config()

Suggested-by: Roman Kagan <rkagan@xxxxxxxxxxxxx>
Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
---
arch/x86/kvm/hyperv.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 0a16a77e6ac3..8723a802e9b7 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -549,6 +549,11 @@ static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config,
trace_kvm_hv_stimer_set_config(stimer_to_vcpu(stimer)->vcpu_id,
stimer->index, config, host);

+ /* Valid vectors for Direct Mode are 16..255. */
+ if (new_config.enable && new_config.direct_mode &&
+ new_config.apic_vector < HV_SYNIC_FIRST_VALID_VECTOR)
+ return 1;
+
stimer_cleanup(stimer);
if (old_config.enable &&
!new_config.direct_mode && new_config.sintx == 0)
--
2.19.2