<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10575">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmocon: fix read buffer overrun in romload_prepare_block()<br><br>Address sanitizer triggered when trying to chainload firmware:<br><br>==18466==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x631000027850 at pc 0x7f5b94cfb733 bp 0x7ffe33e1ae30 sp 0x7ffe33e1a5d8<br>READ of size 1014 at 0x631000027850 thread T0<br>    #0 0x7f5b94cfb732  (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x79732)<br>    #1 0x563db4293e6e in memcpy /usr/include/x86_64-linux-gnu/bits/string_fortified.h:34<br>    #2 0x563db4293e6e in romload_prepare_block osmocom-bb/src/host/osmocon/osmocon.c:473<br>    #3 0x563db429541f in handle_read_romload osmocom-bb/src/host/osmocon/osmocon.c:959<br>    #4 0x563db429541f in serial_read osmocom-bb/src/host/osmocon/osmocon.c:1168<br>    #5 0x7f5b94722c83 in osmo_fd_disp_fds libosmocore/src/select.c:217<br>    #6 0x7f5b94722f84 in osmo_select_main libosmocore/src/select.c:257<br>    #7 0x563db4293b1c in main osmocom-bb/src/host/osmocon/osmocon.c:1525<br>    #8 0x7f5b942b9b96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96)<br>    #9 0x563db4293c79 in _start (prefix/sbin/osmocon+0x1c79)<br><br>0x631000027850 is located 0 bytes to the right of 77904-byte region [0x631000014800,0x631000027850)<br>allocated by thread T0 here:<br>    #0 0x7f5b94d60b50 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xdeb50)<br>    #1 0x563db4294d65 in read_file osmocom-bb/src/host/osmocon/osmocon.c:314<br><br>Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b<br>---<br>M src/host/osmocon/osmocon.c<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c</span><br><span>index a9497dc..6075e61 100644</span><br><span>--- a/src/host/osmocon/osmocon.c</span><br><span>+++ b/src/host/osmocon/osmocon.c</span><br><span>@@ -471,7 +471,7 @@</span><br><span>       remaining_bytes = dnload.data_len - 3 -</span><br><span>                      (dnload.block_payload_size * dnload.block_number);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  memcpy(block_data, dnload.write_ptr, dnload.block_payload_size);</span><br><span style="color: hsl(120, 100%, 40%);">+      memcpy(block_data, dnload.write_ptr, OSMO_MIN(dnload.block_payload_size, remaining_bytes));</span><br><span> </span><br><span>      if (remaining_bytes <= dnload.block_payload_size) {</span><br><span>               fill_bytes = (dnload.block_payload_size - remaining_bytes);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10575">change 10575</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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://gerrit.osmocom.org/10575"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b </div>
<div style="display:none"> Gerrit-Change-Number: 10575 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>