<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13620">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix incorrect buffer size calculation<br><br>Calling sizeof() on a pointer to dynamically allocated memory would<br>result in getting size of the pointer (usually 4 or 8 bytes) itself,<br>but not the size of allocated memory.<br><br>Change-Id: I8ffda4dea2b7f9b4b76dfeecad1fab6384c5a62c<br>Fixes: CID#197629, CID#197628, CID#197627<br>Fixes: CID#197626, CID#197625, CID#197624<br>---<br>M src/msgb.c<br>M src/socket.c<br>M src/utils.c<br>3 files changed, 16 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/msgb.c b/src/msgb.c</span><br><span>index 5a154e5..940135f 100644</span><br><span>--- a/src/msgb.c</span><br><span>+++ b/src/msgb.c</span><br><span>@@ -522,10 +522,11 @@</span><br><span>  */</span><br><span> char *msgb_hexdump_c(const void *ctx, const struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        char *buf = talloc_size(ctx, msgb_length(msg)*3 + 100);</span><br><span style="color: hsl(120, 100%, 40%);">+       size_t buf_len = msgb_length(msg) * 3 + 100;</span><br><span style="color: hsl(120, 100%, 40%);">+  char *buf = talloc_size(ctx, buf_len);</span><br><span>       if (!buf)</span><br><span>            return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    return msgb_hexdump_buf(buf, sizeof(buf), msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       return msgb_hexdump_buf(buf, buf_len, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Print a string to the end of message buffer.</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index c817e72..7c412b6 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -837,7 +837,7 @@</span><br><span>  char *str = talloc_size(ctx, OSMO_SOCK_NAME_MAXLEN);</span><br><span>         if (!str)</span><br><span>            return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_sock_get_name_buf(str, sizeof(str), fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sock_get_name_buf(str, OSMO_SOCK_NAME_MAXLEN, fd);</span><br><span>      return str;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/utils.c b/src/utils.c</span><br><span>index 896e917..b66721e 100644</span><br><span>--- a/src/utils.c</span><br><span>+++ b/src/utils.c</span><br><span>@@ -351,10 +351,11 @@</span><br><span>  */</span><br><span> char *osmo_hexdump_c(const void *ctx, const unsigned char *buf, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   char *hexd_buff = talloc_size(ctx, len*3 + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        size_t hexd_buff_len = len * 3 + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+   char *hexd_buff = talloc_size(ctx, hexd_buff_len);</span><br><span>   if (!hexd_buff)</span><br><span>              return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, " ", true);</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_hexdump_buf(hexd_buff, hexd_buff_len, buf, len, " ", true);</span><br><span>   return hexd_buff;</span><br><span> }</span><br><span> </span><br><span>@@ -389,10 +390,11 @@</span><br><span>  */</span><br><span> char *osmo_hexdump_nospc_c(const void *ctx, const unsigned char *buf, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        char *hexd_buff = talloc_size(ctx, len*2 + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        size_t hexd_buff_len = len * 2 + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+   char *hexd_buff = talloc_size(ctx, hexd_buff_len);</span><br><span>   if (!hexd_buff)</span><br><span>              return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_hexdump_buf(hexd_buff, sizeof(hexd_buff), buf, len, "", true);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_buf(hexd_buff, hexd_buff_len, buf, len, "", true);</span><br><span>    return hexd_buff;</span><br><span> }</span><br><span> </span><br><span>@@ -908,10 +910,11 @@</span><br><span>  */</span><br><span> char *osmo_str_tolower_c(const void *ctx, const char *src)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    char *buf = talloc_size(ctx, strlen(src)+1);</span><br><span style="color: hsl(120, 100%, 40%);">+  size_t buf_len = strlen(src) + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+     char *buf = talloc_size(ctx, buf_len);</span><br><span>       if (!buf)</span><br><span>            return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_str_tolower_buf(buf, sizeof(buf), src);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_str_tolower_buf(buf, buf_len, src);</span><br><span>     return buf;</span><br><span> }</span><br><span> </span><br><span>@@ -966,10 +969,11 @@</span><br><span>  */</span><br><span> char *osmo_str_toupper_c(const void *ctx, const char *src)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  char *buf = talloc_size(ctx, strlen(src)+1);</span><br><span style="color: hsl(120, 100%, 40%);">+  size_t buf_len = strlen(src) + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+     char *buf = talloc_size(ctx, buf_len);</span><br><span>       if (!buf)</span><br><span>            return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_str_toupper_buf(buf, sizeof(buf), src);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_str_toupper_buf(buf, buf_len, src);</span><br><span>     return buf;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13620">change 13620</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/13620"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8ffda4dea2b7f9b4b76dfeecad1fab6384c5a62c </div>
<div style="display:none"> Gerrit-Change-Number: 13620 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>