<p>laforge would like Hoernchen to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15642">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CCID: fix length checks in PC_to_RDR_{GetSlotStatus,SetParameters}<br><br>Change-Id: I5ec32fd5fdf704ee06f21e548a16523a557d4988<br>---<br>M ccid/ccid_device.c<br>1 file changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/42/15642/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/ccid_device.c b/ccid/ccid_device.c</span><br><span>index 346f77d..049b1cf 100644</span><br><span>--- a/ccid/ccid_device.c</span><br><span>+++ b/ccid/ccid_device.c</span><br><span>@@ -678,7 +678,7 @@</span><br><span> </span><br><span>  switch (ch->bMessageType) {</span><br><span>       case PC_to_RDR_GetSlotStatus:</span><br><span style="color: hsl(0, 100%, 40%);">-           if (len != sizeof(u->get_slot_status))</span><br><span style="color: hsl(120, 100%, 40%);">+             if (len < sizeof(u->get_slot_status))</span><br><span>                  goto short_msg;</span><br><span>              rc = ccid_handle_get_slot_status(cs, msg);</span><br><span>           break;</span><br><span>@@ -708,7 +708,8 @@</span><br><span>                 rc = ccid_handle_reset_parameters(cs, msg);</span><br><span>          break;</span><br><span>       case PC_to_RDR_SetParameters:</span><br><span style="color: hsl(0, 100%, 40%);">-           if (len != sizeof(u->set_parameters))</span><br><span style="color: hsl(120, 100%, 40%);">+              // smallest union member</span><br><span style="color: hsl(120, 100%, 40%);">+              if (len < (sizeof(u->set_parameters.abProtocolData.t0)+10))</span><br><span>                    goto short_msg;</span><br><span>              rc = ccid_handle_set_parameters(cs, msg);</span><br><span>            break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15642">change 15642</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/+/15642"/><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: I5ec32fd5fdf704ee06f21e548a16523a557d4988 </div>
<div style="display:none"> Gerrit-Change-Number: 15642 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>