summaryrefslogtreecommitdiff
path: root/firmware/lib/vboot_api_kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/lib/vboot_api_kernel.c')
-rw-r--r--firmware/lib/vboot_api_kernel.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 90703a90..92aaac7b 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -1169,6 +1169,17 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams,
}
}
+ /* If we're in developer mode when we shouldn't be, disable as soon as
+ possible and commit that decision right away, unless WP is off.
+ See b/266013201 and b/268272051 for context. */
+ if ((fwmp.flags & FWMP_DEV_DISABLE_BOOT) &&
+ !(cparams->gbb->flags & GBB_FLAG_FORCE_DEV_SWITCH_ON) &&
+ (shared->flags & VBSD_BOOT_DEV_SWITCH_ON) &&
+ (shared->flags & VBSD_BOOT_FIRMWARE_WP_ENABLED)) {
+ VbNvSet(&vnc, VBNV_DISABLE_DEV_REQUEST, 1);
+ VbNvCommit();
+ }
+
/* Fill in params for calls to LoadKernel() */
Memset(&p, 0, sizeof(p));
p.shared_data_blob = cparams->shared_data_blob;