<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10431">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23: fix unaligned store in osmo_send_l1()<br><br>This fixes the following alignment issue uncovered by asan:<br><br>l1l2_interface.c:169:7: runtime error: store to misaligned address 0x61600001ab99 for type 'uint16_t', which requires 2 byte alignment<br>0x61600001ab99: note: pointer points here<br> 00 00 00  00 00 00 06 0a 01 19 19  40 18 00 07 00 01 03 49  06 15 00 40 01 c0 00 00  00 00 00 00 00<br>              ^<br><br>Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c<br>---<br>M src/host/layer23/src/common/l1l2_interface.c<br>1 file changed, 2 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/10431/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c</span><br><span>index d89995d..956279d 100644</span><br><span>--- a/src/host/layer23/src/common/l1l2_interface.c</span><br><span>+++ b/src/host/layer23/src/common/l1l2_interface.c</span><br><span>@@ -157,16 +157,13 @@</span><br><span> </span><br><span> int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>       DEBUGP(DL1C, "Sending: '%s'\n", osmo_hexdump(msg->data, msg->len));</span><br><span> </span><br><span>      if (msg->l1h != msg->data)</span><br><span>             LOGP(DL1C, LOGL_ERROR, "Message L1 header != Message Data\n");</span><br><span style="color: hsl(0, 100%, 40%);">-        </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   /* prepend 16bit length before sending */</span><br><span style="color: hsl(0, 100%, 40%);">-       len = (uint16_t *) msgb_push(msg, sizeof(*len));</span><br><span style="color: hsl(0, 100%, 40%);">-        *len = htons(msg->len - sizeof(*len));</span><br><span style="color: hsl(120, 100%, 40%);">+     msgb_push_u16(msg, msg->len);</span><br><span> </span><br><span>         if (osmo_wqueue_enqueue(&ms->l2_wq, msg) != 0) {</span><br><span>              LOGP(DL1C, LOGL_ERROR, "Failed to enqueue msg.\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10431">change 10431</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/10431"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c </div>
<div style="display:none"> Gerrit-Change-Number: 10431 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>