diff options
| author | Julius Werner <jwerner@chromium.org> | 2020-02-04 16:39:21 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-11 13:44:19 +0000 |
| commit | 9df04f353c23a9a45cde0321e441e7dcddf5377f (patch) | |
| tree | b0eac8a126bb6e9619073f8f91fccbed63ba9005 /firmware/2lib/2secdata_fwmp.c | |
| parent | 79910141b5474cb9c4c64de2beb390432df150c5 (diff) | |
| download | vboot-9df04f353c23a9a45cde0321e441e7dcddf5377f.tar.gz | |
firmware: Add VB2_REC_OR_DIE() helper macro
After introducing VB2_DIE() recently, practical use has shown that we
pretty much always want to check for recovery mode first, and avoid a
hard abort in that case. This patch introduces a very similar macro that
includes that extra check so we don't have to open-code it all over the
place.
BRANCH=None
BUG=None
TEST=make runtests
Change-Id: I16e744859ba7a5c68269e06c7e7d071f3bfae67e
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2038244
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/2lib/2secdata_fwmp.c')
| -rw-r--r-- | firmware/2lib/2secdata_fwmp.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/firmware/2lib/2secdata_fwmp.c b/firmware/2lib/2secdata_fwmp.c index 7d19fca4..170fc5c2 100644 --- a/firmware/2lib/2secdata_fwmp.c +++ b/firmware/2lib/2secdata_fwmp.c @@ -87,12 +87,8 @@ int vb2_secdata_fwmp_get_flag(struct vb2_context *ctx, (struct vb2_secdata_fwmp *)&ctx->secdata_fwmp; if (!(sd->status & VB2_SD_STATUS_SECDATA_FWMP_INIT)) { - if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) { - VB2_DEBUG("Assuming broken FWMP flag %d as 0\n", flag); - return 0; - } else { - VB2_DIE("Must init FWMP before retrieving flag\n"); - } + VB2_REC_OR_DIE(ctx, "Must init FWMP before retrieving flag\n"); + return 0; } if (ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP) @@ -108,13 +104,8 @@ uint8_t *vb2_secdata_fwmp_get_dev_key_hash(struct vb2_context *ctx) (struct vb2_secdata_fwmp *)&ctx->secdata_fwmp; if (!(sd->status & VB2_SD_STATUS_SECDATA_FWMP_INIT)) { - if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) { - VB2_DEBUG("Assuming broken FWMP dev_key_hash " - "as empty\n"); - return NULL; - } else { - VB2_DIE("Must init FWMP before getting dev key hash\n"); - } + VB2_REC_OR_DIE(ctx, "Must init FWMP before get dev key hash\n"); + return NULL; } if (ctx->flags & VB2_CONTEXT_NO_SECDATA_FWMP) |