From 6ffd42548bf10cda13a01555ff4fa56d4213cdf2 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Thu, 22 Dec 2022 19:23:29 +0000 Subject: multiboot: Refactor boot data validation, add version numbers 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 --- firmware/include/dircache_redirect.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'firmware/include') diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h index f51ce70690..d4d72978c0 100644 --- a/firmware/include/dircache_redirect.h +++ b/firmware/include/dircache_redirect.h @@ -29,7 +29,6 @@ #include "rb-loader.h" #include "multiboot.h" #include "bootdata.h" -#include "crc32.h" #endif #ifndef RB_ROOT_VOL_HIDDEN @@ -144,8 +143,7 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume)) char rtpath[MAX_PATH / 2]; make_volume_root(volume, path); - unsigned int crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); - if (crc > 0 && crc == boot_data.crc) + if (boot_data_valid) { /* we need to mount the drive before we can access it */ root_mount_path(path, 0); /* root could be different folder don't hide */ @@ -174,7 +172,7 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume)) root_mount_path(rtpath, NSITEM_CONTENTS); } - } /*CRC OK*/ + } else { standard_redirect: -- cgit v1.2.3