From 91e5f56242393cd42cc76250f89a184e62333cd3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 21 Jan 2019 15:50:24 +1100
Subject: [PATCH] AP_FlashStorage: fixed a race condition

fixes #7670

thanks to night-ghost for the bug report
---
 libraries/AP_FlashStorage/AP_FlashStorage.cpp | 11 ++++++++---
 libraries/AP_FlashStorage/AP_FlashStorage.h   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_FlashStorage/AP_FlashStorage.cpp b/libraries/AP_FlashStorage/AP_FlashStorage.cpp
index ccc786a99f..6f9259bd19 100644
--- a/libraries/AP_FlashStorage/AP_FlashStorage.cpp
+++ b/libraries/AP_FlashStorage/AP_FlashStorage.cpp
@@ -111,7 +111,12 @@ 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;
-        if (!write_all()) {
+        // 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))) {
             return erase_all();
         }
     }
@@ -309,11 +314,11 @@ bool AP_FlashStorage::erase_all(void)
 /*
   write all of mem_buffer to current sector
  */
-bool AP_FlashStorage::write_all(void)
+bool AP_FlashStorage::write_all(uint16_t start_ofs)
 {
     debug("write_all to sector %u at %u with reserved_space=%u\n",
            current_sector, write_offset, reserved_space);
-    for (uint16_t ofs=0; ofs<storage_size; ofs += max_write) {
+    for (uint16_t ofs=start_ofs; ofs<storage_size; ofs += max_write) {
         if (!all_zero(ofs, max_write)) {
             if (!write(ofs, max_write)) {
                 return false;
diff --git a/libraries/AP_FlashStorage/AP_FlashStorage.h b/libraries/AP_FlashStorage/AP_FlashStorage.h
index e747c5904d..fb6be22aad 100644
--- a/libraries/AP_FlashStorage/AP_FlashStorage.h
+++ b/libraries/AP_FlashStorage/AP_FlashStorage.h
@@ -141,7 +141,7 @@ private:
     bool erase_all();
 
     // write all of mem_buffer to current sector
-    bool write_all(void);
+    bool write_all(uint16_t start_ofs=0);
 
     // return true if all bytes are zero
     bool all_zero(uint16_t ofs, uint16_t size);