synch with upstream c625da4 (e64c5f00) · Commits · Wenxi XU / Mcuboot

boot/bootutil/src/bootutil_misc.c

+32 −10

Original line number	Diff line number	Diff line
		@@ -291,6 +291,27 @@ boot_enc_key_off(const struct flash_area *fap, uint8_t slot)
		}
		#endif

		bool bootutil_buffer_is_erased(const struct flash_area *area,
		const void *buffer, size_t len)
		{
		size_t i;
		uint8_t *u8b;
		uint8_t erased_val;

		if (buffer == NULL \|\| len == 0) {
		return false;
		}

		erased_val = flash_area_erased_val(area);
		for (i = 0, u8b = (uint8_t *)buffer; i < len; i++) {
		if (u8b[i] != erased_val) {
		return false;
		}
		}

		return true;
		}

		int
		boot_read_swap_state(const struct flash_area *fap,
		struct boot_swap_state *state)
		@@ -301,18 +322,18 @@ boot_read_swap_state(const struct flash_area *fap,
		int rc;

		off = boot_magic_off(fap);
		rc = flash_area_read_is_empty(fap, off, magic, BOOT_MAGIC_SZ);
		rc = flash_area_read(fap, off, magic, BOOT_MAGIC_SZ);
		if (rc < 0) {
		return BOOT_EFLASH;
		}
		if (rc == 1) {
		if (bootutil_buffer_is_erased(fap, magic, BOOT_MAGIC_SZ)) {
		state->magic = BOOT_MAGIC_UNSET;
		} else {
		state->magic = boot_magic_decode(magic);
		}

		off = boot_swap_info_off(fap);
		rc = flash_area_read_is_empty(fap, off, &swap_info, sizeof swap_info);
		rc = flash_area_read(fap, off, &swap_info, sizeof swap_info);
		if (rc < 0) {
		return BOOT_EFLASH;
		}
		@@ -321,30 +342,31 @@ boot_read_swap_state(const struct flash_area *fap,
		state->swap_type = BOOT_GET_SWAP_TYPE(swap_info);
		state->image_num = BOOT_GET_IMAGE_NUM(swap_info);

		if (rc == 1 \|\| state->swap_type > BOOT_SWAP_TYPE_REVERT) {
		if (bootutil_buffer_is_erased(fap, &swap_info, sizeof swap_info) \|\|
		state->swap_type > BOOT_SWAP_TYPE_REVERT) {
		state->swap_type = BOOT_SWAP_TYPE_NONE;
		state->image_num = 0;
		}

		off = boot_copy_done_off(fap);
		rc = flash_area_read_is_empty(fap, off, &state->copy_done,
		sizeof state->copy_done);
		rc = flash_area_read(fap, off, &state->copy_done, sizeof state->copy_done);
		if (rc < 0) {
		return BOOT_EFLASH;
		}
		if (rc == 1) {
		if (bootutil_buffer_is_erased(fap, &state->copy_done,
		sizeof state->copy_done)) {
		state->copy_done = BOOT_FLAG_UNSET;
		} else {
		state->copy_done = boot_flag_decode(state->copy_done);
		}

		off = boot_image_ok_off(fap);
		rc = flash_area_read_is_empty(fap, off, &state->image_ok,
		sizeof state->image_ok);
		rc = flash_area_read(fap, off, &state->image_ok, sizeof state->image_ok);
		if (rc < 0) {
		return BOOT_EFLASH;
		}
		if (rc == 1) {
		if (bootutil_buffer_is_erased(fap, &state->image_ok,
		sizeof state->image_ok)) {
		state->image_ok = BOOT_FLAG_UNSET;
		} else {
		state->image_ok = boot_flag_decode(state->image_ok);

boot/bootutil/src/bootutil_priv.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,16 @@ int boot_write_enc_key(const struct flash_area *fap, uint8_t slot,
		int boot_read_enc_key(int image_index, uint8_t slot, struct boot_status *bs);
		#endif

		/**
		* Checks that a buffer is erased according to what the erase value for the
		* flash device provided in `flash_area` is.
		*
		* @returns true if the buffer is erased; false if any of the bytes is not
		* erased, or when buffer is NULL, or when len == 0.
		*/
		bool bootutil_buffer_is_erased(const struct flash_area *area,
		const void *buffer, size_t len);

		/**
		* Safe (non-overflowing) uint32_t addition. Returns true, and stores
		* the result in *dest if it can be done without overflow. Otherwise,

boot/bootutil/src/swap_misc.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -164,8 +164,12 @@ swap_read_status(struct boot_loader_state state, struct boot_status bs)
		rc = swap_read_status_bytes(fap, state, bs);
		if (rc == 0) {
		off = boot_swap_info_off(fap);
		rc = flash_area_read_is_empty(fap, off, &swap_info, sizeof swap_info);
		if (rc == 1) {
		rc = flash_area_read(fap, off, &swap_info, sizeof swap_info);
		if (rc != 0) {
		return BOOT_EFLASH;
		}

		if (bootutil_buffer_is_erased(fap, &swap_info, sizeof swap_info)) {
		BOOT_SET_SWAP_INFO(swap_info, 0, BOOT_SWAP_TYPE_NONE);
		rc = 0;
		}

boot/bootutil/src/swap_move.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,12 +142,12 @@ swap_read_status_bytes(const struct flash_area *fap,
		write_sz = BOOT_WRITE_SZ(state);
		off = boot_status_off(fap);
		for (i = max_entries; i > 0; i--) {
		rc = flash_area_read_is_empty(fap, off + (i - 1) * write_sz, &status, 1);
		rc = flash_area_read(fap, off + (i - 1) * write_sz, &status, 1);
		if (rc < 0) {
		return BOOT_EFLASH;
		}

		if (rc == 1) {
		if (bootutil_buffer_is_erased(fap, &status, 1)) {
		if (rc != last_rc) {
		erased_sections++;
		}

boot/bootutil/src/swap_scratch.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,13 +110,13 @@ swap_read_status_bytes(const struct flash_area *fap,
		found_idx = 0;
		invalid = 0;
		for (i = 0; i < max_entries; i++) {
		rc = flash_area_read_is_empty(fap, off + i * BOOT_WRITE_SZ(state),
		rc = flash_area_read(fap, off + i * BOOT_WRITE_SZ(state),
		&status, 1);
		if (rc < 0) {
		return BOOT_EFLASH;
		}

		if (rc == 1) {
		if (bootutil_buffer_is_erased(fap, &status, 1)) {
		if (found && !found_idx) {
		found_idx = i;
		}

Admin message