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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">avoid talloc abort in simtrace2 frontend_append_script_env()<br><br>talloc requires a valid context for the allocation, we cannot use<br>env[i] as context.<br><br>Change-Id: I82b5e6b91b39d6f5c2a7492adb8c6193083e0d70<br>---<br>M src/client/client.h<br>M src/client/main_fsm.c<br>M src/client/user_ifdhandler.c<br>M src/client/user_shell.c<br>M src/client/user_simtrace2.c<br>5 files changed, 8 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/client.h b/src/client/client.h</span><br><span>index b828882..0024f52 100644</span><br><span>--- a/src/client/client.h</span><br><span>+++ b/src/client/client.h</span><br><span>@@ -48,7 +48,7 @@</span><br><span> int frontend_handle_card2modem(struct bankd_client *bc, const uint8_t *data, size_t len);</span><br><span> int frontend_handle_set_atr(struct bankd_client *bc, const uint8_t *data, size_t len);</span><br><span> int frontend_handle_slot_status(struct bankd_client *bc, const SlotPhysStatus_t *sts);</span><br><span style="color: hsl(0, 100%, 40%);">-int frontend_append_script_env(struct bankd_client *bc, char **env, size_t max_env);</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_append_script_env(struct bankd_client *bc, char **env, int idx, size_t max_env);</span><br><span> </span><br><span> /* main.c */</span><br><span> </span><br><span>diff --git a/src/client/main_fsm.c b/src/client/main_fsm.c</span><br><span>index 0674f6c..673b19e 100644</span><br><span>--- a/src/client/main_fsm.c</span><br><span>+++ b/src/client/main_fsm.c</span><br><span>@@ -75,9 +75,9 @@</span><br><span>        env[i++] = talloc_asprintf(env, "REMSIM_CAUSE=%s", cause);</span><br><span> </span><br><span>     /* ask frontend to append any frontend-speccific additional environment vars */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = frontend_append_script_env(bc, env+i, 256-i);</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = frontend_append_script_env(bc, env, i, 256-i-1);</span><br><span>        if (rc > 0)</span><br><span style="color: hsl(0, 100%, 40%);">-          i += rc;</span><br><span style="color: hsl(120, 100%, 40%);">+              i = rc;</span><br><span> </span><br><span>  /* terminate last entry */</span><br><span>   env[i++] = NULL;</span><br><span>diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c</span><br><span>index 188d3a6..a690503 100644</span><br><span>--- a/src/client/user_ifdhandler.c</span><br><span>+++ b/src/client/user_ifdhandler.c</span><br><span>@@ -206,9 +206,9 @@</span><br><span>  return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int frontend_append_script_env(struct bankd_client *bc, char **env, size_t max_env)</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_append_script_env(struct bankd_client *bc, char **env, int idx, size_t max_env)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return idx;</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span>diff --git a/src/client/user_shell.c b/src/client/user_shell.c</span><br><span>index 40bcddd..9c804c6 100644</span><br><span>--- a/src/client/user_shell.c</span><br><span>+++ b/src/client/user_shell.c</span><br><span>@@ -54,9 +54,9 @@</span><br><span>        return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int frontend_append_script_env(struct bankd_client *bc, char **env, size_t max_env)</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_append_script_env(struct bankd_client *bc, char **env, int idx, size_t max_env)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return idx;</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/src/client/user_simtrace2.c b/src/client/user_simtrace2.c</span><br><span>index 5d5bfc1..f84db9d 100644</span><br><span>--- a/src/client/user_simtrace2.c</span><br><span>+++ b/src/client/user_simtrace2.c</span><br><span>@@ -361,10 +361,9 @@</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int frontend_append_script_env(struct bankd_client *bc, char **env, size_t max_env)</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_append_script_env(struct bankd_client *bc, char **env, int i, size_t max_env)</span><br><span> {</span><br><span>       struct osmo_st2_cardem_inst *ci = bc->cardem;</span><br><span style="color: hsl(0, 100%, 40%);">-        int i = 0;</span><br><span> </span><br><span>       if (max_env < 4)</span><br><span>          return -ENOSPC;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/18437">change 18437</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-remsim/+/18437"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I82b5e6b91b39d6f5c2a7492adb8c6193083e0d70 </div>
<div style="display:none"> Gerrit-Change-Number: 18437 </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: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>