core/sdcard: fix invalid state when filesystem mounting fails

core/src/trezor/sdcard.py

@@ -7,7 +7,7 @@ if False:
 class FilesystemWrapper:
     _INSTANCE = None  # type: Optional[FilesystemWrapper]
 
-    def __init__(self, mounted: bool = True) -> None:
+    def __init__(self, mounted: bool) -> None:
         self.fs = FatFS()
         self.mounted = mounted
         self.counter = 0
@@ -20,23 +20,30 @@ class FilesystemWrapper:
             raise RuntimeError  # cannot request mounted and non-mounted instance at the same time
         return cls._INSTANCE
 
+    def _deinit_instance(self) -> None:
+        if self.mounted:
+            self.fs.unmount()
+        sdcard.power_off()
+        FilesystemWrapper._INSTANCE = None
+
     def __enter__(self) -> "FatFS":
-        if self.counter <= 0:
+        try:
-            self.counter = 0
+            if self.counter <= 0:
-            sdcard.power_on()
+                self.counter = 0
-            if self.mounted:
+                sdcard.power_on()
-                self.fs.mount()
+                if self.mounted:
-        self.counter += 1
+                    self.fs.mount()
-        return self.fs
+            self.counter += 1
+            return self.fs
+        except Exception:
+            self._deinit_instance()
+            raise
 
     def __exit__(self, exc_type: Any, exc_val: Any, tb: Any) -> None:
         self.counter -= 1
         if self.counter <= 0:
             self.counter = 0
-            if self.mounted:
+            self._deinit_instance()
-                self.fs.unmount()
-            sdcard.power_off()
-            FilesystemWrapper._INSTANCE = None
 
 
 def get_filesystem(mounted: bool = True) -> FilesystemWrapper:

core/tests/test_trezor.sdcard.py

@@ -62,6 +62,33 @@ class TestTrezorSdcard(unittest.TestCase):
                 with sdcard.get_filesystem(mounted=True):
                     pass
 
+    def test_failed_mount(self):
+        # set up a filesystem first
+        with sdcard.get_filesystem(mounted=False) as fs:
+            fs.mkfs()
+
+        with sdcard.get_filesystem() as fs:
+            # the following should succeed
+            fs.listdir("/")
+
+        # trash filesystem
+        io.sdcard.power_on()
+        io.sdcard.write(0, bytes([0xFF] * io.sdcard.BLOCK_SIZE))
+        io.sdcard.power_off()
+
+        # mounting should now fail
+        with self.assertRaises(OSError):
+            with sdcard.get_filesystem() as fs:
+                pass
+
+        # it should be possible to create an unmounted instance
+        with sdcard.get_filesystem(mounted=False) as fs:
+            fs.mkfs()
+
+        # mounting should now succeed
+        with sdcard.get_filesystem() as fs:
+            fs.listdir("/")
+
 
 
 if __name__ == "__main__":