diff mbox series

[22/25] binman: Update CheckEntries() for compressed sections

Message ID 20201019024138.3804540-22-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show
Series binman: Support compression of sections | expand

Commit Message

Simon Glass Oct. 19, 2020, 2:41 a.m. UTC
At present this function assumes that the size of a section is at least as
large as its contents. With compression this is often not the case. Relax
this constraint by using the uncompressed size, if available.

Signed-off-by: Simon Glass <sjg@chromium.org>

 tools/binman/etype/section.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series


diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 1618bebe4be..b146239b779 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -299,19 +299,21 @@  class Entry_section(Entry):
     def CheckEntries(self):
         """Check that entries do not overlap or extend outside the section"""
+        max_size = self.size if self.uncomp_size is None else self.uncomp_size
         offset = 0
         prev_name = 'None'
         for entry in self._entries.values():
             if (entry.offset < self._skip_at_start or
                     entry.offset + entry.size > self._skip_at_start +
-                    self.size):
+                    max_size):
                 entry.Raise('Offset %#x (%d) size %#x (%d) is outside the '
                             "section '%s' starting at %#x (%d) "
                             'of size %#x (%d)' %
                             (entry.offset, entry.offset, entry.size, entry.size,
                              self._node.path, self._skip_at_start,
-                             self._skip_at_start, self.size, self.size))
+                             self._skip_at_start, max_size, max_size))
             if entry.offset < offset and entry.size:
                 entry.Raise("Offset %#x (%d) overlaps with previous entry '%s' "
                             "ending at %#x (%d)" %