<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19851">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;">Validate correctly against IPv6 addresses in osmo_ss7_asp_peer_set_hosts()<br><br>Until now, host list validation was only taking into account a set of<br>ipv4-only addresses. As a set can contain now IPv4 and Ipv6 addresses at<br>the same time, we need to do ANYADDAR validation against addresses of<br>that specific version inside the set.<br><br>Change-Id: I18f3cc59149d478259d7afc456bdc5213c1406e5<br>---<br>M src/osmo_ss7.c<br>1 file changed, 21 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index bae9904..b58de34 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -41,6 +41,7 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> #include <osmocom/netif/stream.h></span><br><span> #include <osmocom/netif/ipa.h></span><br><span>@@ -1137,6 +1138,16 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Is string formatted IPv4/v6 addr considered IN(6)ADDR_ANY? */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline bool host_is_ip_anyaddr(const char *host, bool is_v6)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NULL addr is resolved as 0.0.0.0 (IPv4) by getaddrinfo(), most</span><br><span style="color: hsl(120, 100%, 40%);">+ * probably for backward-compatibility reasons.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ return is_v6 ? (host && !strcmp(host, "::"))</span><br><span style="color: hsl(120, 100%, 40%);">+ : (!host || !strcmp(host, "0.0.0.0"));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! \brief Append (copy) address to a given ASP peer. Previous addresses are kept.</span><br><span> * \param[in] peer Application Server Process peer the address is appened to.</span><br><span> * \param[in] talloc_ctx talloc context used to allocate new address.</span><br><span>@@ -1146,28 +1157,28 @@</span><br><span> </span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">- bool new_is_any = !host || !strcmp(host, "0.0.0.0");</span><br><span style="color: hsl(0, 100%, 40%);">- bool iter_is_any;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool new_is_v6 = osmo_ip_str_type(host) == AF_INET6;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool new_is_any = host_is_ip_anyaddr(host, new_is_v6);</span><br><span style="color: hsl(120, 100%, 40%);">+ bool iter_is_v6;</span><br><span> </span><br><span> if (peer->host_cnt >= ARRAY_SIZE(peer->host))</span><br><span> return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Makes no sense to have INET_ANY many times, or INET_ANY together with</span><br><span style="color: hsl(0, 100%, 40%);">- specific addresses: */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Makes no sense to have INET(6)_ANY many times, or INET(6)_ANY</span><br><span style="color: hsl(120, 100%, 40%);">+ together with specific addresses, be it of same or different</span><br><span style="color: hsl(120, 100%, 40%);">+ IP version:*/</span><br><span> if (new_is_any && peer->host_cnt != 0)</span><br><span> return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Makes no sense to add specific address to set if INET_ANY is</span><br><span style="color: hsl(0, 100%, 40%);">- already set: */</span><br><span> if (!new_is_any) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Makes no sense to add specific address to set if INET(6)_ANY</span><br><span style="color: hsl(120, 100%, 40%);">+ is already set, be it from same or different IP version: */</span><br><span> for (i = 0; i < peer->host_cnt; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- iter_is_any = !peer->host[i] ||</span><br><span style="color: hsl(0, 100%, 40%);">- !strcmp(peer->host[i], "0.0.0.0");</span><br><span style="color: hsl(0, 100%, 40%);">- if (iter_is_any)</span><br><span style="color: hsl(120, 100%, 40%);">+ iter_is_v6 = osmo_ip_str_type(peer->host[i]) == AF_INET6;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (host_is_ip_anyaddr(peer->host[i], iter_is_v6))</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_talloc_replace_string(talloc_ctx, &peer->host[peer->host_cnt], host);</span><br><span> peer->host_cnt++;</span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/19851">change 19851</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/libosmo-sccp/+/19851"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I18f3cc59149d478259d7afc456bdc5213c1406e5 </div>
<div style="display:none"> Gerrit-Change-Number: 19851 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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@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>