summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShreenidhi Shedi <sshedi@vmware.com>2022-06-01 15:48:20 +0530
committerBorislav Petkov <bp@suse.de>2022-06-22 11:23:14 +0200
commit4745ca43104b422354f06dc814d3f13661f217af (patch)
treeb68b4e03ccf03d55d66f858c59b1bc9b73aa2280
parenta111daf0c53ae91e71fd2bfe7497862d14132e3e (diff)
downloadlinux-stable-4745ca43104b422354f06dc814d3f13661f217af.tar.gz
linux-stable-4745ca43104b422354f06dc814d3f13661f217af.tar.bz2
linux-stable-4745ca43104b422354f06dc814d3f13661f217af.zip
x86/vmware: Use BIT() macro for shifting
VMWARE_CMD_VCPU_RESERVED is bit 31 and that would mean undefined behavior when shifting an int but the kernel is built with -fno-strict-overflow which will wrap around using two's complement. Use the BIT() macro to improve readability and avoid any potential overflow confusion because it uses an unsigned long. [ bp: Clarify commit message. ] Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> Link: https://lore.kernel.org/r/20220601101820.535031-1-sshedi@vmware.com
-rw-r--r--arch/x86/kernel/cpu/vmware.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index c04b933f48d3..02039ec3597d 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -476,8 +476,8 @@ static bool __init vmware_legacy_x2apic_available(void)
{
uint32_t eax, ebx, ecx, edx;
VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx);
- return (eax & (1 << VMWARE_CMD_VCPU_RESERVED)) == 0 &&
- (eax & (1 << VMWARE_CMD_LEGACY_X2APIC)) != 0;
+ return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&
+ (eax & BIT(VMWARE_CMD_LEGACY_X2APIC));
}
#ifdef CONFIG_AMD_MEM_ENCRYPT