diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/2lib/2misc.c | 10 | ||||
| -rw-r--r-- | firmware/2lib/2ui_screens.c | 7 | ||||
| -rw-r--r-- | firmware/2lib/include/2api.h | 4 | ||||
| -rw-r--r-- | firmware/2lib/include/2return_codes.h | 3 |
4 files changed, 21 insertions, 3 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index f2c6bb41..03766b44 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -375,8 +375,14 @@ vb2_error_t vb2_select_fw_slot(struct vb2_context *ctx) return VB2_SUCCESS; } -void vb2api_enable_developer_mode(struct vb2_context *ctx) +vb2_error_t vb2api_enable_developer_mode(struct vb2_context *ctx) { + if (!vb2api_allow_recovery(ctx)) { + VB2_DEBUG("ERROR: Can only enable developer mode from manual " + "recovery mode\n"); + return VB2_ERROR_API_ENABLE_DEV_NOT_ALLOWED; + } + uint32_t flags; VB2_DEBUG("Enabling developer mode...\n"); @@ -389,6 +395,8 @@ void vb2api_enable_developer_mode(struct vb2_context *ctx) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_EXTERNAL, 1); VB2_DEBUG("Mode change will take effect on next reboot\n"); + + return VB2_SUCCESS; } vb2_error_t vb2api_disable_developer_mode(struct vb2_context *ctx) diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c index 02dc14c4..a2ad2b63 100644 --- a/firmware/2lib/2ui_screens.c +++ b/firmware/2lib/2ui_screens.c @@ -524,7 +524,12 @@ static vb2_error_t recovery_to_dev_finalize(struct vb2_ui_context *ui) } VB2_DEBUG("Enabling dev mode and rebooting...\n"); - vb2api_enable_developer_mode(ui->ctx); + + if (vb2api_enable_developer_mode(ui->ctx) != VB2_SUCCESS) { + VB2_DEBUG("Enable developer mode failed\n"); + return VB2_SUCCESS; + } + return VB2_REQUEST_REBOOT_EC_TO_RO; } diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 54388bb5..66594035 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -972,8 +972,10 @@ int vb2api_allow_recovery(struct vb2_context *ctx); * done on the next boot. * * @param ctx Vboot context + * @return VB2_SUCCESS if success; error if enabling developer mode is not + * allowed. */ -void vb2api_enable_developer_mode(struct vb2_context *ctx); +vb2_error_t vb2api_enable_developer_mode(struct vb2_context *ctx); /** * Request to disable developer mode by setting VB2_NV_DIAG_REQUEST. diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index f3bf50e0..33cb7623 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -704,6 +704,9 @@ enum vb2_return_code { /* Disabling developer mode is not allowed by GBB flags */ VB2_ERROR_API_DISABLE_DEV_NOT_ALLOWED, + /* Enabling developer mode is not allowed in non-recovery mode */ + VB2_ERROR_API_ENABLE_DEV_NOT_ALLOWED, + /********************************************************************** * Errors which may be generated by implementations of vb2ex functions. * Implementation may also return its own specific errors, which should |