]> www.infradead.org Git - users/hch/misc.git/commitdiff
x86/cpu: Validate CPUID leaf 0x2 EDX output
authorAhmed S. Darwish <darwi@linutronix.de>
Tue, 4 Mar 2025 08:51:13 +0000 (09:51 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Mar 2025 08:59:14 +0000 (09:59 +0100)
CPUID leaf 0x2 emits one-byte descriptors in its four output registers
EAX, EBX, ECX, and EDX.  For these descriptors to be valid, the most
significant bit (MSB) of each register must be clear.

Leaf 0x2 parsing at intel.c only validated the MSBs of EAX, EBX, and
ECX, but left EDX unchecked.

Validate EDX's most-significant bit as well.

Fixes: e0ba94f14f74 ("x86/tlb_info: get last level TLB entry number of CPU")
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: stable@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250304085152.51092-3-darwi@linutronix.de
arch/x86/kernel/cpu/intel.c

index 3dce22f00dc34b36e85b86181f5033aff8a8af1d..2a3716afee6336d32fce9154cac465938e0348eb 100644 (file)
@@ -799,7 +799,7 @@ static void intel_detect_tlb(struct cpuinfo_x86 *c)
                cpuid(2, &regs[0], &regs[1], &regs[2], &regs[3]);
 
                /* If bit 31 is set, this is an unknown format */
-               for (j = 0 ; j < 3 ; j++)
+               for (j = 0 ; j < 4 ; j++)
                        if (regs[j] & (1 << 31))
                                regs[j] = 0;