<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10122">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cardem: fix USB message parsing<br><br>the msg->l2h pointer was not set but used later on, e.g. in<br>dispatch_usb_command_cardem, case SIMTRACE_MSGT_DT_CEMU_SET_ATR):<br>>   case SIMTRACE_MSGT_DT_CEMU_SET_ATR:<br>>   >   atr = (struct cardemu_usb_msg_set_atr *) msg->l2h;<br>>   >   card_emu_set_atr(ci->ch, atr->atr, atr->atr_len);<br>l2h is by default 0, thus not pointing to the actual message l2h.<br>I wonder how cardem worked worked before with this issue though.<br><br>Change-Id: Ifbb53dbf478d8dade82251f769e78e1306e77434<br>---<br>M firmware/libcommon/source/mode_cardemu.c<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/22/10122/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index 7bb06f9..57d541b 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -593,6 +593,7 @@</span><br><span>          usb_buf_free(msg);</span><br><span>           return;</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+     msg->l2h = msg->l1h + sizeof(*sh);</span><br><span> </span><br><span>         switch (sh->msg_class) {</span><br><span>  case SIMTRACE_MSGC_GENERIC:</span><br><span>@@ -604,7 +605,6 @@</span><br><span>    case SIMTRACE_MSGC_MODEM:</span><br><span>            /* FIXME: Find out why this fails if used for !=</span><br><span>              * MSGC_MODEM ?!? */</span><br><span style="color: hsl(0, 100%, 40%);">-            msg->l2h = msg->l1h + sizeof(*sh);</span><br><span>             dispatch_usb_command_modem(msg, ci);</span><br><span>                 break;</span><br><span>       default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10122">change 10122</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/10122"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifbb53dbf478d8dade82251f769e78e1306e77434 </div>
<div style="display:none"> Gerrit-Change-Number: 10122 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>