Skip to content

Commit 0812a81

Browse files
committed
[nrf fromtree] bootutil: Temporarly drop mem cleanup from boot_state_clear
Temporal removal of memset clear of boot_sector_clear that was causing boot to stop. The problem happens due to fill_rsp assigning pointer to header stored in cleared boot_state object, and the memset makes it inaccessible. Once change where header is copied to rsp the memset should be brought back as the boot_loader state should be completed before we pass further in execution. Fixes #2535 (cherry picked from commit e6fefac) Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
1 parent 6a8c5fc commit 0812a81

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

boot/bootutil/src/bootutil_misc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ void boot_state_clear(struct boot_loader_state *state)
713713
boot_enc_drop(&state->enc[image][slot]);
714714
}
715715
}
716+
#else
717+
(void)state;
716718
#endif
717-
memset(state, 0, sizeof(struct boot_loader_state));
718719
}

0 commit comments

Comments
 (0)