<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20689">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ccid xfers: return proper error to host instead of asserting<br><br>This could have led to hangs when trying T=1 data blobs where the length<br>field is not the T=0 length field and is therefore misinterpreted.<br><br>Closes: OS#4805<br>Change-Id: Iacdf60e4401f8e287f60ea148b0944d0a3de491d<br>---<br>M ccid_common/ccid_slot_fsm.c<br>1 file changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c</span><br><span>index 23577eb..2338919 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -294,8 +294,11 @@</span><br><span>  ss->seq = xfb->hdr.bSeq;</span><br><span> </span><br><span>   /* must be '0' for TPDU level exchanges or for short APDU */</span><br><span style="color: hsl(0, 100%, 40%);">-    OSMO_ASSERT(xfb->wLevelParameter == 0x0000);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msgb_length(msg) > xfb->hdr.dwLength);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (xfb->wLevelParameter != 0x0000)</span><br><span style="color: hsl(120, 100%, 40%);">+                return -8;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (msgb_length(msg) != xfb->hdr.dwLength)</span><br><span style="color: hsl(120, 100%, 40%);">+         return -1;</span><br><span> </span><br><span>       msgb_pull(msg, 10);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20689">change 20689</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/c/osmo-ccid-firmware/+/20689"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iacdf60e4401f8e287f60ea148b0944d0a3de491d </div>
<div style="display:none"> Gerrit-Change-Number: 20689 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>