Merge pull request #852 from onekey-sec/fix-ubi-seek-error

fix(ubi): add exception handler for SeekError
onekey-sec · Jun 6, 2024 · fde468c · fde468c
2 parents 76e855c + 9143144
commit fde468c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/tests/integration/filesystem/ubi/ubi/__input__/orange.ubi.truncated.img b/tests/integration/filesystem/ubi/ubi/__input__/orange.ubi.truncated.img
diff --git a/.../integration/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/0-3407872.ubi b/.../integration/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/0-3407872.ubi
diff --git a/...nge.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs b/...nge.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs
diff --git a/...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange1.txt b/...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange1.txt
diff --git a/...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange2.txt b/...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange2.txt
diff --git a/...t__/orange.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-rootfs.ubifs b/...t__/orange.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-rootfs.ubifs
diff --git a/...on/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/3407872-3430400.unknown b/...on/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/3407872-3430400.unknown
diff --git a/unblob/handlers/filesystem/ubi.py b/unblob/handlers/filesystem/ubi.py
@@ -7,7 +7,7 @@
 
 from unblob.extractors import Command
 
-from ...file_utils import InvalidInputFormat, get_endian, iterate_patterns
+from ...file_utils import InvalidInputFormat, SeekError, get_endian, iterate_patterns
 from ...iter_utils import get_intervals
 from ...models import File, Handler, HexString, StructHandler, ValidChunk
 
@@ -81,7 +81,7 @@ class UBIFSHandler(StructHandler):
     """
     HEADER_STRUCT = "ubifs_sb_node_t"
 
-    EXTRACTOR = Command("ubireader_extract_files", "{inpath}", "-o", "{outdir}")
+    EXTRACTOR = Command("ubireader_extract_files", "{inpath}", "-w", "-o", "{outdir}")
 
     def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]:
         endian = get_endian(file, self._BIG_ENDIAN_MAGIC)
@@ -137,8 +137,10 @@ def _walk_ubi(self, file: File, peb_size: int) -> int:
             first_bytes = file.read(len(self._UBI_EC_HEADER))
             if first_bytes == b"" or first_bytes != self._UBI_EC_HEADER:
                 break
-            file.seek(offset + peb_size)
-
+            try:
+                file.seek(offset + peb_size)
+            except SeekError:
+                break
         return offset
 
     def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]: