commit 8ae94c2d24d36d1469483c9923a4d7ecbc3910b0
author Randall Spangler <rspangler@chromium.org> Fri Apr 01 13:35:46 2011 -0700
committer Randall Spangler <rspangler@chromium.org> Fri Apr 01 13:35:46 2011 -0700
tree ee7c3ad3edcd30d6e979929a1d1adf2f5b5cf4b5
parent e871ea6a822619eb301e1cc533935bf08f16a6dd

Fix preamble range checks

Change-Id: I0571f4524703566b8840e2b264d868c404f87c80

R=gauravsh@chromium.org,wfrichar@chromium.org
BUG=chrome-os-partner:2910
TEST=make && make runtests

Review URL: http://codereview.chromium.org/6759075

firmware/lib/vboot_common.c

diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c
index d9838c4..a20e16f 100644
--- a/firmware/lib/vboot_common.c
+++ b/firmware/lib/vboot_common.c
@@ -333,15 +333,15 @@
     return VBOOT_PREAMBLE_INVALID;
   }
 
-  /* Verify body signature is inside the block */
-  if (VerifySignatureInside(preamble, preamble->preamble_size,
+  /* Verify body signature is inside the signed data */
+  if (VerifySignatureInside(preamble, sig->data_size,
                             &preamble->body_signature)) {
     VBDEBUG(("Firmware body signature off end of preamble\n"));
     return VBOOT_PREAMBLE_INVALID;
   }
 
-  /* Verify kernel subkey is inside the block */
-  if (VerifyPublicKeyInside(preamble, preamble->preamble_size,
+  /* Verify kernel subkey is inside the signed data */
+  if (VerifyPublicKeyInside(preamble, sig->data_size,
                             &preamble->kernel_subkey)) {
     VBDEBUG(("Kernel subkey off end of preamble\n"));
     return VBOOT_PREAMBLE_INVALID;
@@ -387,8 +387,8 @@
     return VBOOT_PREAMBLE_INVALID;
   }
 
-  /* Verify body signature is inside the block */
-  if (VerifySignatureInside(preamble, preamble->preamble_size,
+  /* Verify body signature is inside the signed data */
+  if (VerifySignatureInside(preamble, sig->data_size,
                             &preamble->body_signature)) {
     VBDEBUG(("Kernel body signature off end of preamble\n"));
     return VBOOT_PREAMBLE_INVALID;