Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfaa790a authored by Borislav Petkov's avatar Borislav Petkov Committed by Paolo Bonzini
Browse files

kvm: Fix CR3_PCID_INVD type on 32-bit 



arch/x86/kvm/emulate.c: In function ‘check_cr_write’:
arch/x86/kvm/emulate.c:3552:4: warning: left shift count >= width of type
    rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;

happens because sizeof(UL) on 32-bit is 4 bytes but we shift it 63 bits
to the left.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 54750f2c

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
			  | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))



#define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL

#define CR3_PCID_INVD		 (1UL << 63)

#define CR3_PCID_INVD		 BIT_64(63)

#define CR4_RESERVED_BITS                                               \

	(~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\

			  | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \