tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "[MTE] Add interface to communicate MTE status to bootloader." am: 61152e4337 am: c652569b15 am: becda4abff

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1915327

Change-Id: I711869483937aaf009f348583ce3cc8fd8aa0555
This commit is contained in:
Florian Mayer 2022-01-21 19:09:51 +00:00 committed by Automerger Merge Worker
commit 3b0a78831d
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootloader_message/bootloader_message.cpp
View file

@ -304,6 +304,16 @@ bool WriteMiscVirtualAbMessage(const misc_virtual_ab_message& message, std::stri
offsetof(misc_system_space_layout, virtual_ab_message), err);
}
bool ReadMiscMemtagMessage(misc_memtag_message* message, std::string* err) {
return ReadMiscPartitionSystemSpace(message, sizeof(*message),
offsetof(misc_system_space_layout, memtag_message), err);
}
bool WriteMiscMemtagMessage(const misc_memtag_message& message, std::string* err) {
return WriteMiscPartitionSystemSpace(&message, sizeof(message),
offsetof(misc_system_space_layout, memtag_message), err);
}
extern "C" bool write_reboot_bootloader(void) {
std::string err;
return write_reboot_bootloader(&err);

20
bootloader_message/include/bootloader_message/bootloader_message.h
View file

@ -93,18 +93,35 @@ struct misc_virtual_ab_message {
uint8_t reserved[57];
} __attribute__((packed));
struct misc_memtag_message {
uint8_t version;
uint32_t magic; // magic string for treble compat
uint32_t memtag_mode;
uint8_t reserved[55];
} __attribute__((packed));
#define MISC_VIRTUAL_AB_MESSAGE_VERSION 2
#define MISC_VIRTUAL_AB_MAGIC_HEADER 0x56740AB0
#define MISC_MEMTAG_MESSAGE_VERSION 1
#define MISC_MEMTAG_MAGIC_HEADER 0x5afefe5a
#define MISC_MEMTAG_MODE_MEMTAG 0x1
#define MISC_MEMTAG_MODE_MEMTAG_ONCE 0x2
#define MISC_MEMTAG_MODE_MEMTAG_KERNEL 0x4
#define MISC_MEMTAG_MODE_MEMTAG_KERNEL_ONCE 0x8
#if (__STDC_VERSION__ >= 201112L) || defined(__cplusplus)
static_assert(sizeof(struct misc_virtual_ab_message) == 64,
"struct misc_virtual_ab_message has wrong size");
static_assert(sizeof(struct misc_memtag_message) == 64,
"struct misc_virtual_ab_message has wrong size");
#endif
// This struct is not meant to be used directly, rather, it is to make
// computation of offsets easier. New fields must be added to the end.
struct misc_system_space_layout {
misc_virtual_ab_message virtual_ab_message;
misc_memtag_message memtag_message;
} __attribute__((packed));
#ifdef __cplusplus
@ -172,6 +189,9 @@ bool write_wipe_package(const std::string& package_data, std::string* err);
bool ReadMiscVirtualAbMessage(misc_virtual_ab_message* message, std::string* err);
bool WriteMiscVirtualAbMessage(const misc_virtual_ab_message& message, std::string* err);
// Read or write the memtag message from system space in /misc.
bool ReadMiscMemtagMessage(misc_memtag_message* message, std::string* err);
bool WriteMiscMemtagMessage(const misc_memtag_message& message, std::string* err);
#else
#include <stdbool.h>