<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14980">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;">sgsnemu: Fix unaligned pointer access during ip/icmp checksum<br><br>Catched by gcc 9.1.0:<br>osmo-ggsn/sgsnemu/sgsnemu.c:1294:2: error: converting a packed struct ip_ping pointer (alignment 1) to a uint16_t {aka short unsigned int} pointer (alignment 2) may result in an unaligned pointer value [-Werror=address-of-packed-member]<br> 1294 | p = (uint16_t *) & pack;<br><br>Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7<br>---<br>M sgsnemu/sgsnemu.c<br>1 file changed, 12 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c</span><br><span>index 8e41031..4f1f844 100644</span><br><span>--- a/sgsnemu/sgsnemu.c</span><br><span>+++ b/sgsnemu/sgsnemu.c</span><br><span>@@ -1234,7 +1234,7 @@</span><br><span> {</span><br><span> </span><br><span> struct ip_ping pack;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t *p = (uint16_t *) & pack;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t v16;</span><br><span> uint8_t *p8 = (uint8_t *) & pack;</span><br><span> struct in_addr src;</span><br><span> unsigned int n;</span><br><span>@@ -1270,7 +1270,7 @@</span><br><span> pack.seq = htons(seq);</span><br><span> </span><br><span> /* Generate ICMP payload */</span><br><span style="color: hsl(0, 100%, 40%);">- p8 = (uint8_t *) & pack + CREATEPING_IP + CREATEPING_ICMP;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 = (uint8_t *) &pack + CREATEPING_IP + CREATEPING_ICMP;</span><br><span> for (n = 0; n < (datasize); n++)</span><br><span> p8[n] = n;</span><br><span> </span><br><span>@@ -1278,11 +1278,13 @@</span><br><span> gettimeofday(tp, &tz);</span><br><span> </span><br><span> /* Calculate IP header checksum */</span><br><span style="color: hsl(0, 100%, 40%);">- p = (uint16_t *) & pack;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 = (uint8_t *) &pack;</span><br><span> count = CREATEPING_IP;</span><br><span> sum = 0;</span><br><span> while (count > 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- sum += *p++;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&v16, p8, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ sum += v16;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 += 2;</span><br><span> count -= 2;</span><br><span> }</span><br><span> while (sum >> 16)</span><br><span>@@ -1292,14 +1294,16 @@</span><br><span> /* Calculate ICMP checksum */</span><br><span> count = CREATEPING_ICMP + datasize; /* Length of ICMP message */</span><br><span> sum = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- p = (uint16_t *) & pack;</span><br><span style="color: hsl(0, 100%, 40%);">- p += CREATEPING_IP / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 = (uint8_t *) &pack;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 += CREATEPING_IP;</span><br><span> while (count > 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- sum += *p++;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&v16, p8, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ sum += v16;</span><br><span style="color: hsl(120, 100%, 40%);">+ p8 += 2;</span><br><span> count -= 2;</span><br><span> }</span><br><span> if (count > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- sum += *(unsigned char *)p;</span><br><span style="color: hsl(120, 100%, 40%);">+ sum += *(unsigned char *)p8;</span><br><span> while (sum >> 16)</span><br><span> sum = (sum & 0xffff) + (sum >> 16);</span><br><span> pack.checksum = ~sum;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14980">change 14980</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-ggsn/+/14980"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I783f104c31234a07f2a13f6dbc577a71b25b36a7 </div>
<div style="display:none"> Gerrit-Change-Number: 14980 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>