<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19809">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_sock_inti2_multiaddr: Fix memleak and free uninitialized mem<br><br>Under some specific cases, res_loc could be leaked. Under some others,<br>res_loc and res_rem were freed without being initialized previously.<br><br>Fixes: CID#212863<br>Fixes: CID#212861<br>Change-Id: Id9c4eda6fd1172e7324aa23c81e8658967a8dd0b<br>---<br>M src/socket.c<br>1 file changed, 13 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/19809/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 50d59e5..0b84b99 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -566,8 +566,10 @@</span><br><span>   if (flags & OSMO_SOCK_F_CONNECT) {</span><br><span>               rc = addrinfo_helper_multi(res_rem, family, type, proto, remote_hosts,</span><br><span>                                          remote_hosts_cnt, remote_port, false);</span><br><span style="color: hsl(0, 100%, 40%);">-               if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                  return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+               if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+                 goto ret_freeaddrinfo_loc;</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span>            /* Figure out if there's any IPv4 or IPv6  addr in the set */</span><br><span>            if (family == AF_UNSPEC)</span><br><span>                     addrinfo_has_v4v6addr((const struct addrinfo **)res_rem, remote_hosts_cnt,</span><br><span>@@ -660,10 +662,15 @@</span><br><span>   if (sfd >= 0)</span><br><span>             close(sfd);</span><br><span> ret_freeaddrinfo:</span><br><span style="color: hsl(0, 100%, 40%);">-        for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">-                freeaddrinfo(res_loc[i]);</span><br><span style="color: hsl(0, 100%, 40%);">-       for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(0, 100%, 40%);">-               freeaddrinfo(res_rem[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (flags & OSMO_SOCK_F_CONNECT) {</span><br><span style="color: hsl(120, 100%, 40%);">+                for (i = 0; i < remote_hosts_cnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+                     freeaddrinfo(res_rem[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+ret_freeaddrinfo_loc:</span><br><span style="color: hsl(120, 100%, 40%);">+      if (flags & OSMO_SOCK_F_BIND) {</span><br><span style="color: hsl(120, 100%, 40%);">+           for (i = 0; i < local_hosts_cnt; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+                      freeaddrinfo(res_loc[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span>    return rc;</span><br><span> }</span><br><span> #endif /* HAVE_LIBSCTP */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19809">change 19809</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/+/19809"/><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: Id9c4eda6fd1172e7324aa23c81e8658967a8dd0b </div>
<div style="display:none"> Gerrit-Change-Number: 19809 </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>