devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

multiboot: Refactor boot data validation, add version numbers

Browse source 
Instead of verifying the CRC before every access of the boot data,
verify the CRC once at startup and set a flag to indicate the boot
data is valid.

Also add a framework to support multiple boot protocol versions.
Firmware declares the maximum supported protocol version using a
version byte in the boot data header. The bootloader chooses the
highest version supported by it and the firmware when deciding
what boot protocol to use.

Change-Id: I810194625dc0833f026d2a23b8d64ed467fa6aca
This commit is contained in:
Aidan MacDonald 2022-12-22 19:23:29 +00:00
parent af644e02a1
commit 6ffd42548b
11 changed files with 150 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

41
apps/debug_menu.c
View file

@ -2530,38 +2530,31 @@ static bool dbg_pic(void)
#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
static bool dbg_boot_data(void)
{
unsigned int crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
struct simplelist_info info;
info.scroll_all = true;
simplelist_info_init(&info, "Boot data", 1, NULL);
simplelist_set_line_count(0);
#if defined(HAVE_MULTIBOOT)
char rootpath[MAX_PATH / 2] = RB_ROOT_CONTENTS_DIR;
int boot_volume = 0;
if(crc == boot_data.crc)
if (!boot_data_valid)
{
boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
int rtlen = get_redirect_dir(rootpath, sizeof(rootpath), boot_volume, "", "");
while (rtlen > 0 && rootpath[--rtlen] == PATH_SEPCH) /* remove extra separators */
rootpath[rtlen] = '\0';
simplelist_addline("Boot data invalid");
simplelist_addline("Magic[0]: %08lx", boot_data.magic[0]);
simplelist_addline("Magic[1]: %08lx", boot_data.magic[1]);
simplelist_addline("Length: %lu", boot_data.length);
}
simplelist_addline("Boot Volume: <%lu>", boot_volume);
simplelist_addline("Root:");
simplelist_addline("%s", rootpath);
simplelist_addline("");
#endif
simplelist_addline("Bootdata RAW:");
if (crc != boot_data.crc)
simplelist_addline("Magic: %.8s", boot_data.magic);
simplelist_addline("Length: %lu", boot_data.length);
simplelist_addline("CRC: %lx", boot_data.crc);
(crc == boot_data.crc) ? simplelist_addline("CRC: OK!") :
simplelist_addline("CRC: BAD");
for (unsigned i = 0; i < boot_data.length; i += 4)
else
{
simplelist_addline("%02x: %02x %02x %02x %02x", i, boot_data.payload[i],
boot_data.payload[i+1], boot_data.payload[i+2], boot_data.payload[i+3]);
simplelist_addline("Boot data valid");
simplelist_addline("Version: %d", (int)boot_data.version);
simplelist_addline("Boot volume: %d", (int)boot_data.boot_volume);
}
simplelist_addline("Bootdata RAW:");
for (size_t i = 0; i < boot_data.length; i += 4)
{
simplelist_addline("%02x: %02x %02x %02x %02x", i,
boot_data.payload[i + 0], boot_data.payload[i + 1],
boot_data.payload[i + 2], boot_data.payload[i + 3]);
}
return simplelist_show_list(&info);

5
apps/main.c
View file

@ -77,6 +77,7 @@
#include "statusbar-skinned.h"
#include "bootchart.h"
#include "logdiskf.h"
#include "bootdata.h"
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
#include "notification.h"
#endif
@ -445,6 +446,10 @@ static void init(void)
core_allocator_init();
kernel_init();
#if defined(HAVE_BOOTDATA) && !defined(BOOTLOADER)
verify_boot_data();
#endif
/* early early early! */
filesystem_init();