nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unaligned buffer in async updater

Browse Source
This commit is contained in:
Han Cen 2024-02-10 20:44:14 +08:00
parent edb3989b57
commit d77b6a60d2
No known key found for this signature in database
GPG Key ID: CB0F30AE8AABEAA4
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
embassy-boot/src/firmware_updater/asynch.rs
View File

@ -276,16 +276,25 @@ impl<'d, STATE: NorFlash> FirmwareState<'d, STATE> {
async fn set_magic(&mut self, magic: u8) -> Result<(), FirmwareUpdaterError> { async fn set_magic(&mut self, magic: u8) -> Result<(), FirmwareUpdaterError> {
self.state.read(0, &mut self.aligned).await?; self.state.read(0, &mut self.aligned).await?;
if self.aligned.iter().any(|&b| b != magic) { if self.aligned[..STATE::WRITE_SIZE].iter().any(|&b| b != magic) {
// Read progress validity // Read progress validity
self.state.read(STATE::WRITE_SIZE as u32, &mut self.aligned).await?; if STATE::READ_SIZE <= 2 * STATE::WRITE_SIZE {
self.state.read(STATE::WRITE_SIZE as u32, &mut self.aligned).await?;
} else {
self.aligned.rotate_left(STATE::WRITE_SIZE);
}
if self.aligned.iter().any(|&b| b != STATE_ERASE_VALUE) { if self.aligned[..STATE::WRITE_SIZE]
.iter()
.any(|&b| b != STATE_ERASE_VALUE)
{
// The current progress validity marker is invalid // The current progress validity marker is invalid
} else { } else {
// Invalidate progress // Invalidate progress
self.aligned.fill(!STATE_ERASE_VALUE); self.aligned.fill(!STATE_ERASE_VALUE);
self.state.write(STATE::WRITE_SIZE as u32, &self.aligned).await?; self.state
.write(STATE::WRITE_SIZE as u32, &self.aligned[..STATE::WRITE_SIZE])
.await?;
} }
// Clear magic and progress // Clear magic and progress
@ -293,7 +302,7 @@ impl<'d, STATE: NorFlash> FirmwareState<'d, STATE> {
// Set magic // Set magic
self.aligned.fill(magic); self.aligned.fill(magic);
self.state.write(0, &self.aligned).await?; self.state.write(0, &self.aligned[..STATE::WRITE_SIZE]).await?;
} }
Ok(()) Ok(())
} }