<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24639">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
keith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
Objections:
neels: I would prefer this is not merged as is
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: Pre-calculate required size before allocating msgb<br><br>This commit fixes crash when response is more than ~4096 chars.<br>Furthermore, we now allocate only the required memory, not 4096 for all<br>messages, which usually don't require it.<br>Test needs to be adapted since it assumed there was more available space<br>at the end of the msgb.<br><br>Related: OS#5169<br>Change-Id: I0b8f370f7b08736207f9efed13a0663b5e482824<br>---<br>M src/ctrl/control_cmd.c<br>M tests/ctrl/ctrl_test.c<br>2 files changed, 34 insertions(+), 62 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c</span><br><span>index 33496bd..753e6cc 100644</span><br><span>--- a/src/ctrl/control_cmd.c</span><br><span>+++ b/src/ctrl/control_cmd.c</span><br><span>@@ -516,92 +516,61 @@</span><br><span> * \returns callee-allocated message buffer containing the encoded \a cmd; NULL on error */</span><br><span> struct msgb *ctrl_cmd_make(struct ctrl_cmd *cmd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *strbuf;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t len;</span><br><span> const char *type;</span><br><span style="color: hsl(0, 100%, 40%);">- char *tmp;</span><br><span> </span><br><span> if (!cmd->id)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = msgb_alloc_headroom(4096, 128, "ctrl command make");</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> type = get_value_string(ctrl_type_vals, cmd->type);</span><br><span> </span><br><span> switch (cmd->type) {</span><br><span> case CTRL_TYPE_GET:</span><br><span> if (!cmd->variable)</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = talloc_asprintf(cmd, "%s %s %s", type, cmd->id, cmd->variable);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tmp) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLCTRL, LOGL_ERROR, "Failed to allocate cmd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l2h = msgb_put(msg, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(msg->l2h, tmp, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tmp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf = talloc_asprintf(cmd, "%s %s %s", type, cmd->id, cmd->variable);</span><br><span> break;</span><br><span> case CTRL_TYPE_SET:</span><br><span> if (!cmd->variable || !cmd->value)</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = talloc_asprintf(cmd, "%s %s %s %s", type, cmd->id, cmd->variable,</span><br><span style="color: hsl(0, 100%, 40%);">- cmd->value);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tmp) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLCTRL, LOGL_ERROR, "Failed to allocate cmd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l2h = msgb_put(msg, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(msg->l2h, tmp, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tmp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf = talloc_asprintf(cmd, "%s %s %s %s", type, cmd->id,</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->variable, cmd->value);</span><br><span> break;</span><br><span> case CTRL_TYPE_GET_REPLY:</span><br><span> case CTRL_TYPE_SET_REPLY:</span><br><span> case CTRL_TYPE_TRAP:</span><br><span> if (!cmd->variable || !cmd->reply)</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = talloc_asprintf(cmd, "%s %s %s %s", type, cmd->id, cmd->variable,</span><br><span style="color: hsl(0, 100%, 40%);">- cmd->reply);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tmp) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLCTRL, LOGL_ERROR, "Failed to allocate cmd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l2h = msgb_put(msg, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(msg->l2h, tmp, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tmp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf = talloc_asprintf(cmd, "%s %s %s %s", type, cmd->id,</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->variable, cmd->reply);</span><br><span> break;</span><br><span> case CTRL_TYPE_ERROR:</span><br><span> if (!cmd->reply)</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = talloc_asprintf(cmd, "%s %s %s", type, cmd->id,</span><br><span style="color: hsl(0, 100%, 40%);">- cmd->reply);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tmp) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLCTRL, LOGL_ERROR, "Failed to allocate cmd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l2h = msgb_put(msg, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(msg->l2h, tmp, strlen(tmp));</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(tmp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf = talloc_asprintf(cmd, "%s %s %s", type, cmd->id, cmd->reply);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "Unknown command type %i\n", cmd->type);</span><br><span style="color: hsl(0, 100%, 40%);">- goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strbuf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLCTRL, LOGL_ERROR, "Failed to allocate cmd.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ len = strlen(strbuf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-err:</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc_headroom(len + 128, 128, "ctrl ERROR command make");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l2h = msgb_put(msg, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(msg->l2h, strbuf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ret:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(strbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return msg;</span><br><span> }</span><br><span> </span><br><span> /*! Build a deferred control command state and keep it the per-connection list of deferred commands.</span><br><span>diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c</span><br><span>index b46e9ac..01fb9f7 100644</span><br><span>--- a/tests/ctrl/ctrl_test.c</span><br><span>+++ b/tests/ctrl/ctrl_test.c</span><br><span>@@ -117,11 +117,14 @@</span><br><span> } else {</span><br><span> struct msgb *sent_msg = msgb_dequeue(&ccon->write_queue.msg_queue);</span><br><span> OSMO_ASSERT(sent_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(sent_msg, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("replied: '%s'\n", osmo_escape_str((char*)msgb_l2(sent_msg), -1));</span><br><span style="color: hsl(120, 100%, 40%);">+ char *strbuf = talloc_size(sent_msg, msgb_l2len(sent_msg) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(strbuf, msgb_l2(sent_msg), msgb_l2len(sent_msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ strbuf[msgb_l2len(sent_msg)] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("replied: '%s'\n", osmo_escape_str(strbuf, -1));</span><br><span> OSMO_ASSERT(t->reply_str);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(t->reply_str, (char*)msgb_l2(sent_msg)));</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!strcmp(t->reply_str, strbuf));</span><br><span> msgb_free(sent_msg);</span><br><span> }</span><br><span> osmo_wqueue_clear(&ccon->write_queue);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24639">change 24639</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/libosmocore/+/24639"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0b8f370f7b08736207f9efed13a0663b5e482824 </div>
<div style="display:none"> Gerrit-Change-Number: 24639 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>