Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_FlashStorage: fixed a corruption bug 

many thanks to @sh83 for tracking down this bug. When write_all() is
called with non-zero offset in init it ends up calling write with an
invalid offset, triggering a full reset

This fixes issue #10874
This commit is contained in:
Andrew Tridgell 2019-03-28 07:56:36 +11:00
parent 8441542a52
commit 6e1e89bb70
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_FlashStorage/AP_FlashStorage.cpp
View File

@ -17,6 +17,7 @@
#include <AP_HAL/AP_HAL.h>
#include <AP_FlashStorage/AP_FlashStorage.h>
#include <AP_Math/AP_Math.h>
#include <stdio.h>
#define FLASHSTORAGE_DEBUG 0
@ -111,12 +112,7 @@ bool AP_FlashStorage::init(void)
// if the first sector is full then write out all data so we can erase it
if (states[first_sector] == SECTOR_STATE_FULL) {
current_sector = first_sector ^ 1;
// we start by writing all except the sector header
if (!write_all(sizeof(sector_header))) {
return erase_all();
}
// now write the header
if (!write(0, sizeof(sector_header))) {
if (!write_all()) {
return erase_all();
}
}
@ -314,13 +310,14 @@ bool AP_FlashStorage::erase_all(void)
/*
write all of mem_buffer to current sector
*/
bool AP_FlashStorage::write_all(uint16_t start_ofs)
bool AP_FlashStorage::write_all()
{
debug("write_all to sector %u at %u with reserved_space=%u\n",
current_sector, write_offset, reserved_space);
for (uint16_t ofs=start_ofs; ofs<storage_size; ofs += max_write) {
if (!all_zero(ofs, max_write)) {
if (!write(ofs, max_write)) {
for (uint16_t ofs=0; ofs<storage_size; ofs += max_write) {
uint8_t n = MIN(max_write, storage_size-ofs);
if (!all_zero(ofs, n)) {
if (!write(ofs, n)) {
return false;
}
}

2
libraries/AP_FlashStorage/AP_FlashStorage.h
View File

@ -141,7 +141,7 @@ private:
bool erase_all();
// write all of mem_buffer to current sector
bool write_all(uint16_t start_ofs=0);
bool write_all();
// return true if all bytes are zero
bool all_zero(uint16_t ofs, uint16_t size);