diff mbox series

filemap.py: enforce maximum of 4kb block size

Message ID 20230324201333.77508-1-geissonator@gmail.com
State Accepted, archived
Commit 1e23b803af6991fc20e4a4e88a0ef0541399e722
Headers show
Series filemap.py: enforce maximum of 4kb block size | expand

Commit Message

Andrew Geissler March 24, 2023, 8:13 p.m. UTC
The logic in this script validates that the length of data sections are
evenly divisible by the block size. On most systems the block size is
4KB and all is good. Some systems though, such as ppc64le, have a block
size larger then 4KB. For example on a POWER9 based ppc64le system, the
block size is 64KB.

This results in this script failing with errors like this when building
wic images:
|440, in _do_get_mapped_ranges
|     assert extent_len % self.block_size == 0
|            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| AssertionError

In this case the data section size was 268KB and the block size was
64KB, resulting in the above assert failure.

Resolves https://bugzilla.yoctoproject.org/show_bug.cgi?id=15075

Signed-off-by: Andrew Geissler <geissonator@gmail.com>
 scripts/lib/wic/filemap.py | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series


diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index 4d9da28172..85b39d5d74 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -46,6 +46,13 @@  def get_block_size(file_obj):
             bsize = stat.st_blksize
             raise IOError("Unable to determine block size")
+    # The logic in this script only supports a maximum of a 4KB
+    # block size
+    max_block_size = 4 * 1024
+    if bsize > max_block_size:
+        bsize = max_block_size
     return bsize
 class ErrorNotSupp(Exception):