From 4414ed33445be7a501d2308950f32f796a755792 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 14 Apr 2010 16:57:11 +0200 Subject: [PATCH] --- yaml --- r: 190079 b: refs/heads/master c: e8861cfe2c75bdce36655b64d7ce02c2b31b604d h: refs/heads/master i: 190077: 6a52151f610b289418d6e3b2a6c251f143efc66e 190075: 4b528df1cb775f8afdadc01dc7f11d0043f057a8 190071: d0bfe156139b543ccb64a3b92a41c67455caeaff 190063: 7d2b9c31b594c243d90d0fcabe4f5835b1ee1eae 190047: cc03d13a6b617b85a76222f680d529a2086accfc 190015: 26aae71c3cc69fd8a5fe48bcbcf0c6fa64d06af5 189951: 771820fe15355080f29cbb2c53b62d0cf85b0c09 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3901fd9081ce..aa8506d3adfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eda2beda835697878e309b6049aa0a3bad051590 +refs/heads/master: e8861cfe2c75bdce36655b64d7ce02c2b31b604d diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 45aa90f8cc57..3c4ca98ad27f 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -5126,6 +5126,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason) int ret = 0; u32 old_tss_base = get_segment_base(vcpu, VCPU_SREG_TR); u16 old_tss_sel = get_segment_selector(vcpu, VCPU_SREG_TR); + u32 desc_limit; old_tss_base = kvm_mmu_gva_to_gpa_write(vcpu, old_tss_base, NULL); @@ -5148,7 +5149,10 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason) } } - if (!nseg_desc.p || get_desc_limit(&nseg_desc) < 0x67) { + desc_limit = get_desc_limit(&nseg_desc); + if (!nseg_desc.p || + ((desc_limit < 0x67 && (nseg_desc.type & 8)) || + desc_limit < 0x2b)) { kvm_queue_exception_e(vcpu, TS_VECTOR, tss_selector & 0xfffc); return 1; }