<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/21070">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: do not allow xfers with inactive slots<br><br>pcscd tries to do this if the previous command led to a deactivation...<br><br>Change-Id: If2659c7d5e8784e5e4393d5b12589e96d517168a<br>---<br>M ccid_common/ccid_device.c<br>M ccid_common/ccid_slot_fsm.c<br>2 files changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c</span><br><span>index fe21414..7819d41 100644</span><br><span>--- a/ccid_common/ccid_device.c</span><br><span>+++ b/ccid_common/ccid_device.c</span><br><span>@@ -462,7 +462,7 @@</span><br><span> </span><br><span>       /* handle this asynchronously */</span><br><span>     rc = cs->ci->slot_ops->xfr_block_async(cs, msg, &u->xfr_block);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc <= 0) {</span><br><span>            msgb_trim(msg, sizeof(struct ccid_rdr_to_pc_data_block));</span><br><span>            resp = ccid_gen_data_block(cs, u->xfr_block.hdr.bSeq, CCID_CMD_STATUS_FAILED, -rc, 0, 0);</span><br><span>                 goto out;</span><br><span>diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c</span><br><span>index af5b713..043fa8f 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -302,12 +302,16 @@</span><br><span>   if (msgb_length(msg) != xfb->hdr.dwLength + 10)</span><br><span>           return -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        /* might be unpowered after failed ppss that led to reset */</span><br><span style="color: hsl(120, 100%, 40%);">+  if (cs->icc_powered != true)</span><br><span style="color: hsl(120, 100%, 40%);">+               return -0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         msgb_pull(msg, 10);</span><br><span> </span><br><span>      LOGPCS(cs, LOGL_DEBUG, "scheduling TPDU transfer: %s\n", msgb_hexdump(msg));</span><br><span>       osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_XCEIVE_TPDU_CMD, msg);</span><br><span>   /* continues in iso_fsm_clot_user_cb once response/error/timeout is received */</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return 1;</span><br><span> }</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/21070">change 21070</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/+/21070"/><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: If2659c7d5e8784e5e4393d5b12589e96d517168a </div>
<div style="display:none"> Gerrit-Change-Number: 21070 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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-Reviewer: rousseau <ludovic.rousseau+osmocom@free.fr> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>