<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14620">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Use structures instead of raw arrays when parsing ipcp_hdr<br><br>We have a structure to handle that data type, so let's use it.<br><br>Change-Id: I991e53544b733df7773d66280ffa19a2a5123d97<br>---<br>M ggsn/ggsn.c<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/20/14620/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index 466f07d..34cab39 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -419,13 +419,13 @@</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* determine if IPCP contains given option */</span><br><span style="color: hsl(0, 100%, 40%);">-static const uint8_t *ipcp_contains_option(const uint8_t *ipcp, size_t ipcp_len,</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t ipcp_len,</span><br><span> enum ipcp_options opt, size_t opt_minlen)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *cur_opt = ipcp + sizeof(struct ipcp_hdr);</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *cur_opt = ipcp->options;</span><br><span> </span><br><span> /* iterate over Options and check if protocol contained */</span><br><span style="color: hsl(0, 100%, 40%);">- while (cur_opt + sizeof(struct ipcp_option_hdr) <= ipcp + ipcp_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + ipcp_len) {</span><br><span> const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt;</span><br><span> /* length value includes 2 bytes type/length */</span><br><span> if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr))</span><br><span>@@ -587,7 +587,7 @@</span><br><span> const struct in46_addr *dns1 = &apn->v4.cfg.dns[0];</span><br><span> const struct in46_addr *dns2 = &apn->v4.cfg.dns[1];</span><br><span> uint8_t *start = resp->tail;</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *ipcp;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct ipcp_hdr *ipcp;</span><br><span> uint16_t ipcp_len;</span><br><span> uint8_t *len1, *len2;</span><br><span> unsigned int len_appended;</span><br><span>@@ -599,10 +599,10 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ipcp = pco_elem->data;</span><br><span style="color: hsl(0, 100%, 40%);">- consumed = (ipcp - &pdp->pco_req.v[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipcp = (const struct ipcp_hdr *)pco_elem->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ consumed = (pco_elem->data - &pdp->pco_req.v[0]);</span><br><span> remain = sizeof(pdp->pco_req.v) - consumed;</span><br><span style="color: hsl(0, 100%, 40%);">- ipcp_len = osmo_load16be(ipcp + 2); /* 1=code + 1=id */</span><br><span style="color: hsl(120, 100%, 40%);">+ ipcp_len = osmo_load16be(&ipcp->len);</span><br><span> if (remain < 0 || remain < ipcp_len) {</span><br><span> LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n");</span><br><span> return;</span><br><span>@@ -613,7 +613,7 @@</span><br><span> len1 = msgb_put(resp, 1); /* Length of contents: delay */</span><br><span> </span><br><span> msgb_put_u8(resp, 0x02); /* ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(resp, ipcp[1]); /* ID: Needs to match request */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(resp, ipcp->id); /* ID: Needs to match request */</span><br><span> msgb_put_u8(resp, 0x00); /* Length MSB */</span><br><span> len2 = msgb_put(resp, 1); /* Length LSB: delay */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14620">change 14620</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/+/14620"/><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: I991e53544b733df7773d66280ffa19a2a5123d97 </div>
<div style="display:none"> Gerrit-Change-Number: 14620 </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-MessageType: newchange </div>