diff options
| author | edisonhello <edisonhello@google.com> | 2021-07-28 15:03:38 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-12 08:13:12 +0000 |
| commit | d8de9942e2fdfdf3f1792740cb5419163faff3ea (patch) | |
| tree | cfeba75c29a429c58e297360a37b0bfa166915f9 /firmware | |
| parent | 302794156d6689d97eba7d7f6907498858d6b0ef (diff) | |
| download | vboot-d8de9942e2fdfdf3f1792740cb5419163faff3ea.tar.gz | |
vboot/misc: Add validity check in vb2api_enable_developer_mode
Check vb2api_allow_recovery before actual changes in
vb2api_enable_developer_mode.
Add new API error type VB2_ERROR_API_ENABLE_DEV_NOT_ALLOWED in
vb2_error_t.
Add spaces in the output message of vb2_misc_tests for indentation.
BUG=b:172339016
TEST=export CC=x86_64-pc-linux-gnu-clang DEBUG=1 DETACHABLE=0; \
make -j32 test_setup && make -j32 runtests;
TEST=export CC=x86_64-pc-linux-gnu-clang DEBUG=1 DETACHABLE=1; \
make -j32 test_setup && make -j32 runtests;
TEST=Hayato booted into developer mode
BRANCH=none
Change-Id: Ifebdd01ca87cf944c394907eca73a09fc3bf5457
Signed-off-by: edisonhello <edisonhello@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3056240
Reviewed-by: Julius Werner <jwerner@chromium.org>
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 |