fix: add image alignment costraints

Author: rizlik

src/boot_x86_fsp.c

@@ -88,6 +88,15 @@ const uint8_t __attribute__((section(".sig_wolfboot_raw")))
 #define PCI_DEVICE_CONTROLLER_TO_PEX 0x6
 #define PCIE_TRAINING_TIMEOUT_MS (100)
 
+/* compile time alignment checks */
+#define ALIGN_CHECK(value, alignment) ((value) & ((alignment)-1)) == 0
+#if !ALIGN_CHECK(FSP_S_LOAD_BASE - IMAGE_HEADER_SIZE, 16)
+#error "FSP_S_LOAD_BASE must be aligned on a 16 bytes boundary"
+#endif
+#if !ALIGN_CHECK(WOLFBOOT_LOAD_BASE - IMAGE_HEADER_SIZE, 16)
+#error "WOLFBOOT_LOAD_BASE must be aligned on a 16 bytes boundary"
+#endif
+
 typedef uint32_t (*memory_init_cb)(void *udp, struct efi_hob **HobList);
 typedef uint32_t (*temp_ram_exit_cb)(void *udp);
 typedef uint32_t (*silicon_init_cb)(void *udp);

src/update_disk.c

@@ -79,9 +79,9 @@ extern uint8_t _end_wb[];
  */
 void RAMFUNCTION wolfBoot_start(void)
 {
+    uint8_t p_hdr[IMAGE_HEADER_SIZE] __attribute__((aligned(16)));
     struct stage2_parameter *stage2_params;
     struct wolfBoot_image os_image;
-    uint8_t p_hdr[IMAGE_HEADER_SIZE];
     int pA_ver = 0, pB_ver = 0;
     uint32_t cur_part = 0;
     int ret = -1;
@@ -135,8 +135,8 @@ void RAMFUNCTION wolfBoot_start(void)
         selected = 0;
 
     stage2_params = stage2_get_parameters();
-    /* load the image just after wolfboot */
-    load_address = (uint32_t *)(_end_wb);
+    /* load the image just after wolfboot, 16 bytes aligned */
+    load_address = (uint32_t *)((((uintptr_t)_end_wb) + 0xf) & ~0xf);
     wolfBoot_printf("Load address 0x%x\r\n", load_address);
     do {
         failures++;