summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2014-10-22 15:21:32 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-23 03:32:57 +0000
commitb035e370a7ca315d1e4d249274893ef11bcac700 (patch)
tree30f89ba4ea429f9638e78027f380268d51d9c874 /firmware
parent9504754fee346569b4cdcaae9f54fa65cf3005d9 (diff)
downloadvboot-b035e370a7ca315d1e4d249274893ef11bcac700.tar.gz
vboot2: Fix broken compatiblity check for gbb header 1.1
vboot2 supports only GBB header versions 1.1+. When the GBB header was rev'd to 1.2, this broke the compatibility check for 1.1. However, the test was written in such a way that wasn't detected. Fix the check and the test. BUG=chromium:415227 BRANCH=none TEST=VBOOT2=1 make runtests Change-Id: Ifeb1f21bf5cf3cc05d31ac7912693e090eb8fd5e Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/225110 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'firmware')
-rw-r--r--firmware/2lib/2misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c
index bcf5b362..a0ae60e0 100644
--- a/firmware/2lib/2misc.c
+++ b/firmware/2lib/2misc.c
@@ -50,7 +50,7 @@ int vb2_read_gbb_header(struct vb2_context *ctx, struct vb2_gbb_header *gbb)
return VB2_ERROR_GBB_VERSION;
/* Current code is not backwards-compatible to 1.0 headers */
- if (gbb->minor_version < VB2_GBB_MINOR_VER)
+ if (gbb->minor_version == 0)
return VB2_ERROR_GBB_TOO_OLD;
/*