Attention is currently required from: Christian Walter, Arthur Heymans, Kyösti Mälkki, Patrick Rudolph.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/54010 )
Change subject: cpu/x86/entry16.S: Make Intel CBnT TOCTOU safe
......................................................................
Patch Set 2:
(1 comment)
File src/cpu/x86/entry16.S:
https://review.coreboot.org/c/coreboot/+/54010/comment/52b01468_63ea9d1b
PS2, Line 135: 2:
Since %ebx is not used, how about: […]
Looks like CMOVcc does not work with immediates...
movl $0x60000001, %ebx /* CD, NW, PE = 1 */
#if CONFIG(INTEL_CBNT_SUPPORT)
#include <cpu/intel/msr.h>
/* Do not disable caching if the BootGuard ACM has set up CAR */
movl $MSR_BOOT_GUARD_SACM_INFO, %ecx
rdmsr
movl $0x01, %edx /* PE = 1 */
test $B_BOOT_GUARD_SACM_INFO_NEM_ENABLED, %eax
cmovne %edx, %ebx
#endif
movl %cr0, %eax
andl $0x7FFAFFD1, %eax /* PG,AM,WP,NE,TS,EM,MP = 0 */
orl %ebx, %eax
movl %eax, %cr0
Alternatively, use a jump
--
To view, visit
https://review.coreboot.org/c/coreboot/+/54010
To unsubscribe, or for help writing mail filters, visit
https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id2031e4e406655e14198e45f137ba152f8b6f567
Gerrit-Change-Number: 54010
Gerrit-PatchSet: 2
Gerrit-Owner: Arthur Heymans
arthur@aheymans.xyz
Gerrit-Reviewer: Angel Pons
th3fanbus@gmail.com
Gerrit-Reviewer: Christian Walter
christian.walter@9elements.com
Gerrit-Reviewer: Kyösti Mälkki
kyosti.malkki@gmail.com
Gerrit-Reviewer: Patrick Rudolph
siro@das-labor.org
Gerrit-Reviewer: build bot (Jenkins)
no-reply@coreboot.org
Gerrit-Attention: Christian Walter
christian.walter@9elements.com
Gerrit-Attention: Arthur Heymans
arthur@aheymans.xyz
Gerrit-Attention: Kyösti Mälkki
kyosti.malkki@gmail.com
Gerrit-Attention: Patrick Rudolph
siro@das-labor.org
Gerrit-Comment-Date: Mon, 10 May 2021 08:50:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Angel Pons
th3fanbus@gmail.com
Gerrit-MessageType: comment