[PATCH] kvm: ||/&& typo

[PATCH] kvm: ||/&& typo

[Roel Kluin]

This was also reported by Jörg-Volker Peetz here:
http://lkml.org/lkml/2009/2/16/325
------------------->8---------------------8<-----------------------
Since ss.type is always either not 3 or not 7.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6259d74..7c4cca1 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1813,7 +1813,7 @@ static bool stack_segment_valid(struct kvm_vcpu *vcpu)
 	vmx_get_segment(vcpu, &ss, VCPU_SREG_SS);
 	ss_rpl = ss.selector & SELECTOR_RPL_MASK;
 
-	if ((ss.type != 3) || (ss.type != 7))
+	if ((ss.type != 3) && (ss.type != 7))
 		return false;
 	if (!ss.s)
 		return false;

Re: [PATCH] kvm: ||/&& typo

[Roel Kluin]

Roel Kluin wrote:
> This was also reported by Jörg-Volker Peetz here:
> http://lkml.org/lkml/2009/2/16/325

Please use this one, It gives Jörg-Volker Peetz credits, and I
missed another issue just below.

------------------->8---------------------8<-----------------------
Since ss.type is always either not 3 or not 7.

Reported-by: Jörg-Volker Peetz <jvpeetz@web.de>
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6259d74..3f3cab2 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1813,7 +1813,7 @@ static bool stack_segment_valid(struct kvm_vcpu *vcpu)
 	vmx_get_segment(vcpu, &ss, VCPU_SREG_SS);
 	ss_rpl = ss.selector & SELECTOR_RPL_MASK;
 
-	if ((ss.type != 3) || (ss.type != 7))
+	if ((ss.type != 3) && (ss.type != 7))
 		return false;
 	if (!ss.s)
 		return false;
@@ -1856,7 +1856,7 @@ static bool tr_valid(struct kvm_vcpu *vcpu)
 
 	if (tr.selector & SELECTOR_TI_MASK)	/* TI = 1 */
 		return false;
-	if ((tr.type != 3) || (tr.type != 11)) /* TODO: Check if guest is in IA32e mode */
+	if ((tr.type != 3) && (tr.type != 11)) /* TODO: Check if guest is in IA32e mode */
 		return false;
 	if (!tr.present)
 		return false;

Re: [PATCH] kvm: ||/&& typo

[Avi Kivity]

Roel Kluin wrote:
> Roel Kluin wrote:
>   
>> This was also reported by Jörg-Volker Peetz here:
>> http://lkml.org/lkml/2009/2/16/325
>>     
>
> Please use this one, It gives Jörg-Volker Peetz credits, and I
> missed another issue just below.
>
>   

This is already fixed in kvm.git.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.