diff options
| author | David Anderson <dvander@google.com> | 2019-11-20 15:47:07 -0800 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2019-11-20 16:23:52 -0800 |
| commit | 682d2a5db2a61a6f97c09d7c143e023fe2bd4e14 (patch) | |
| tree | 9d2c83c32caf346061fd81cc7e390c513dad4dc3 /bootloader_message | |
| parent | ca18e7fe5a7ad0faa4cd0fce872f44acd5c2a034 (diff) | |
bootloader_message: Add a magic header to the Virtual A/B message block.
This adds a sanity check in addition to the version number in case misc
contains random bits.
Bug: 139156011
Test: manual test
Change-Id: Ie4f3731d2b1795340881c88e0c4eec9cd4432653
Diffstat (limited to 'bootloader_message')
| -rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index a27e80bc..9a482d42 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -189,12 +189,14 @@ static_assert(sizeof(struct bootloader_control) == // must be added to the end. struct misc_virtual_ab_message { uint8_t version; + uint32_t magic; uint8_t merge_status; // IBootControl 1.1, MergeStatus enum. uint8_t source_slot; // Slot number when merge_status was written. - uint8_t reserved[61]; + uint8_t reserved[57]; } __attribute__((packed)); -#define MISC_VIRTUAL_AB_MESSAGE_VERSION 1 +#define MISC_VIRTUAL_AB_MESSAGE_VERSION 2 +#define MISC_VIRTUAL_AB_MAGIC_HEADER 0x56740AB0 #if (__STDC_VERSION__ >= 201112L) || defined(__cplusplus) static_assert(sizeof(struct misc_virtual_ab_message) == 64, |