bootutil: Support trailers larger than sector size for swap scratch (ffe4ec9c) · Commits · Wenxi XU / Mcuboot

boot/bootutil/src/swap_scratch.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -490,6 +490,7 @@ boot_swap_sectors(int idx, uint32_t sz, struct boot_loader_state *state,
		const struct flash_area *fap_scratch;
		uint32_t copy_sz;
		uint32_t trailer_sz;
		uint32_t sector_sz;
		uint32_t img_off;
		uint32_t scratch_trailer_off;
		struct boot_swap_state swap_state;
		@@ -514,6 +515,21 @@ boot_swap_sectors(int idx, uint32_t sz, struct boot_loader_state *state,
		* controls if special handling is needed (swapping last sector).
		*/
		last_sector = boot_img_num_sectors(state, BOOT_PRIMARY_SLOT) - 1;
		sector_sz = boot_img_sector_size(state, BOOT_PRIMARY_SLOT, last_sector);

		if (sector_sz < trailer_sz) {
		uint32_t trailer_sector_sz = sector_sz;

		while (trailer_sector_sz < trailer_sz) {
		/* Consider that the image trailer may span across sectors of
		* different sizes.
		*/
		sector_sz = boot_img_sector_size(state, BOOT_PRIMARY_SLOT, --last_sector);

		trailer_sector_sz += sector_sz;
		}
		}

		if ((img_off + sz) >
		boot_img_sector_off(state, BOOT_PRIMARY_SLOT, last_sector)) {
		copy_sz -= trailer_sz;