From 7e21e13ec96fb7607b40f85e38491a9b059b48da Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 12 Sep 2017 18:49:40 +0200
Subject: [PATCH] Disallow writing running firmware (#5208)

Overwriting running firmware leads to crash and incompletely written firmware
---
 .../src/targets/common/arm/stm32/usbd_storage_msd.cpp  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
index 862037978..53eb31784 100644
--- a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
+++ b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
@@ -464,7 +464,11 @@ const FATDirEntry_t g_DIRroot[16] =
     {
         { 'F', 'I', 'R', 'M', 'W', 'A', 'R', 'E'},
         { 'B', 'I', 'N'},
-        0x20,           // Archive
+#if defined(BOOT)
+        0x20,          // Archive
+#else
+        0x21,          // Readonly+Archive
+#endif
         0x00,
         0x3E,
         0xA301,
@@ -739,6 +743,9 @@ int32_t fat12Write(const uint8_t * buffer, uint16_t sector, uint16_t count)
     }
   }
   else if (sector < 3 + (EEPROM_SIZE/BLOCK_SIZE) + (FLASHSIZE/BLOCK_SIZE)) {
+#if !defined(BOOT) // Don't allow overwrite of running firmware
+  return -1;
+#else
     // firmware
     uint32_t address;
     address = sector - 3 - (EEPROM_SIZE/BLOCK_SIZE);
@@ -765,6 +772,7 @@ int32_t fat12Write(const uint8_t * buffer, uint16_t sector, uint16_t count)
         operation = FATWRITE_NONE;
       }
     }
+#endif
   }
   return 0 ;
 }