From 36dccdbad1c88657ee893b794b5aba2feacefaa5 Mon Sep 17 00:00:00 2001 From: Nick Sanders Date: Tue, 28 Jun 2011 17:47:42 -0700 Subject: [PATCH] Add check to validate VbSharedData magic TEST=run crossystem BUG=chrome-os-partner:4691 Change-Id: If590d185446dfa7cb628b5014f3a9a9c7b7a901d Reviewed-on: http://gerrit.chromium.org/gerrit/3355 Reviewed-by: Nick Sanders Tested-by: Nick Sanders --- host/arch/arm/lib/crossystem_arch.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 554fe810bf..7e6095ebe0 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -276,6 +276,13 @@ VbSharedDataHeader *VbSharedDataRead(void) { size_t size = 0; if (ReadFdtBlock("vboot-shared-data", &block, &size)) return NULL; + VbSharedDataHeader *p = (VbSharedDataHeader *)block; + if (p->magic != VB_SHARED_DATA_MAGIC) { + fprintf(stderr, "%s: failed to validate magic in " + "VbSharedDataHeader (%x != %x)\n", + __FUNCTION__, p->magic, VB_SHARED_DATA_MAGIC); + return NULL; + } return (VbSharedDataHeader *)block; }