diff options
| author | Joel Kitching <kitching@google.com> | 2020-01-10 02:31:11 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-11 03:15:49 +0000 |
| commit | cd08c7797d8281cb10c7721599ddc5602ab359e3 (patch) | |
| tree | 61a428384a71db78d26751dde532554fe21be103 /firmware/lib | |
| parent | 0290303b484de6dc9d30f0f339e9183d854d47df (diff) | |
| download | vboot-cd08c7797d8281cb10c7721599ddc5602ab359e3.tar.gz | |
vboot: remove VBSD from tests that don't need it
Also clean up a few lines setting unneeded flags and fields in
tests, and add conditionals to check for VBSD in vboot_display.c.
BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none
Change-Id: I84438d00777516354529b1e6ee4d04f7947ff971
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1992856
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib')
| -rw-r--r-- | firmware/lib/vboot_display.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 36a28323..f0e2e806 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -219,7 +219,6 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx) struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); struct vb2_workbuf wb; - VbSharedDataHeader *shared = sd->vbsd; char buf[DEBUG_INFO_SIZE] = ""; char sha1sum[VB2_SHA1_DIGEST_SIZE * 2 + 1]; uint32_t used = 0; @@ -253,10 +252,13 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx) RecoveryReasonString(sd->recovery_reason), DEBUG_INFO_SIZE - used); - /* Add VbSharedDataHeader flags */ - used += StrnAppend(buf + used, "\nVbSD.flags: 0x", DEBUG_INFO_SIZE - used); - used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, - shared->flags, 16, 8); + /* Add VbSharedDataHeader flags if available */ + if (sd->vbsd) { + used += StrnAppend(buf + used, "\nVbSD.flags: 0x", + DEBUG_INFO_SIZE - used); + used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, + sd->vbsd->flags, 16, 8); + } /* Add raw contents of VbNvStorage */ used += StrnAppend(buf + used, "\nVbNv.raw:", DEBUG_INFO_SIZE - used); @@ -332,8 +334,8 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx) } /* If we're in dev-mode, show the kernel subkey that we expect, too. */ - if (0 == sd->recovery_reason) { - FillInSha1Sum(sha1sum, &shared->kernel_subkey); + if (0 == sd->recovery_reason && sd->vbsd) { + FillInSha1Sum(sha1sum, &sd->vbsd->kernel_subkey); used += StrnAppend(buf + used, "\nkernel_subkey: ", DEBUG_INFO_SIZE - used); used += StrnAppend(buf + used, sha1sum, DEBUG_INFO_SIZE - used); |