<p>Joel Kitching has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbfstool/extract: ignore compression field for some payload segments<br><br>When extracting a payload from CBFS, ignore compression fields for<br>these types of payload segments:<br>  - PAYLOAD_SEGMENT_ENTRY<br>  - PAYLOAD_SEGMENT_BSS<br>  - PAYLOAD_SEGMENT_PARAMS<br><br>These types of payload segments cannot be compressed, and in certain<br>cases are being erroneously labeled as compressed, causing errors<br>when extracting the payload.<br><br>For an example of this problem, see creation of PAYLOAD_SEGMENT_ENTRY<br>segments in cbfs-mkpayload.c, where the only field that is written to<br>is |load_addr|.<br><br>Also, add a linebreak to an ERROR line.<br><br>BUG=b:111576981<br>TEST=cbfstool tianocore.cbfs extract -m x86 -n payload -f /tmp/payload -v -v<br><br>Change-Id: I8c5c40205d648799ea577ad0c5bee6ec2dd7d05f<br>Signed-off-by: kitching@google.com<br>---<br>M util/cbfstool/cbfs_image.c<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/27520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c</span><br><span>index e533483..a0b7e7b 100644</span><br><span>--- a/util/cbfstool/cbfs_image.c</span><br><span>+++ b/util/cbfstool/cbfs_image.c</span><br><span>@@ -925,14 +925,6 @@</span><br><span>                 struct buffer tbuff;</span><br><span>                 size_t decomp_size;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-         /* The payload uses an unknown compression algorithm. */</span><br><span style="color: hsl(0, 100%, 40%);">-                decompress = decompression_function(segments[i].compression);</span><br><span style="color: hsl(0, 100%, 40%);">-           if (decompress == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       ERROR("Unknown decompression algorithm: %u",</span><br><span style="color: hsl(0, 100%, 40%);">-                                  segments[i].compression);</span><br><span style="color: hsl(0, 100%, 40%);">-                       return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-              }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>            /* Segments BSS and ENTRY do not have binary data. */</span><br><span>                if (segments[i].type == PAYLOAD_SEGMENT_BSS ||</span><br><span>                               segments[i].type == PAYLOAD_SEGMENT_ENTRY) {</span><br><span>@@ -947,6 +939,14 @@</span><br><span>                  continue;</span><br><span>            }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+         /* The payload uses an unknown compression algorithm. */</span><br><span style="color: hsl(120, 100%, 40%);">+              decompress = decompression_function(segments[i].compression);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (decompress == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     ERROR("Unknown decompression algorithm: %u",</span><br><span style="color: hsl(120, 100%, 40%);">+                                        segments[i].compression);</span><br><span style="color: hsl(120, 100%, 40%);">+                     return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          if (buffer_create(&tbuff, segments[i].mem_len, "segment")) {</span><br><span>                   buffer_delete(&new_buffer);</span><br><span>                      return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27520">change 27520</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27520"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8c5c40205d648799ea577ad0c5bee6ec2dd7d05f </div>
<div style="display:none"> Gerrit-Change-Number: 27520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>