commit 57084e54082a29d19d2e4b71581c2a4980f8ce15
author Jakub Grajciar <jgrajcia@cisco.com> Mon Mar 01 08:45:17 2021 +0100
committer Damjan Marion <dmarion@me.com> Thu Mar 04 09:09:08 2021 +0000
tree 11c937ad36d0da11ef4407fc6384feed0d105a09
parent 0ac5782e600097b66e6b06e0b9edc79651f3a4bd

libmemif: socket filename length 108

Dynamic size array was causing trouble in
strlcpy. LINUX allows for max 108 filename length,
so we can use that to make the array constant size.

Type: fix

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I76b1fc41f9d93cfbc9ad11bdca0c96a1fc261e84

extras/libmemif/src/main.c

diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c
index 1eb6929..36f1251 100644
--- a/extras/libmemif/src/main.c
+++ b/extras/libmemif/src/main.c
@@ -948,13 +948,7 @@
     }
   memset (ms, 0, sizeof (memif_socket_t));
   /* set filename */
-  ms->filename = lm->alloc (strlen (filename) + sizeof (char));
-  if (ms->filename == NULL)
-    {
-      err = MEMIF_ERR_NOMEM;
-      goto error;
-    }
-  memset (ms->filename, 0, strlen (filename) + sizeof (char));
+  memset (ms->filename, 0, sizeof (ms->filename));
   strlcpy ((char *) ms->filename, filename, sizeof (ms->filename));
 
   ms->type = MEMIF_SOCKET_TYPE_NONE;
@@ -977,11 +971,6 @@
 error:
   if (ms != NULL)
     {
-      if (ms->filename != NULL)
-	{
-	  lm->free (ms->filename);
-	  ms->filename = NULL;
-	}
       if (ms->fd > 0)
 	{
 	  close (ms->fd);
@@ -1032,13 +1021,7 @@
   memset (ms, 0, sizeof (memif_socket_t));
   ms->lm = lm;
   /* set filename */
-  ms->filename = lm->alloc (strlen (filename) + sizeof (char));
-  if (ms->filename == NULL)
-    {
-      err = MEMIF_ERR_NOMEM;
-      goto error;
-    }
-  memset (ms->filename, 0, strlen (filename) + sizeof (char));
+  memset (ms->filename, 0, sizeof (ms->filename));
   strlcpy ((char *) ms->filename, filename, sizeof (ms->filename));
 
   ms->type = MEMIF_SOCKET_TYPE_NONE;
@@ -1061,11 +1044,6 @@
 error:
   if (ms != NULL)
     {
-      if (ms->filename != NULL)
-	{
-	  lm->free (ms->filename);
-	  ms->filename = NULL;
-	}
       if (ms->fd > 0)
 	{
 	  close (ms->fd);
@@ -1796,8 +1774,6 @@
 
   lm->free (ms->interface_list);
   ms->interface_list = NULL;
-  lm->free (ms->filename);
-  ms->filename = NULL;
   lm->free (ms);
   *sock = ms = NULL;
 

extras/libmemif/src/memif_private.h

diff --git a/extras/libmemif/src/memif_private.h b/extras/libmemif/src/memif_private.h
index 59899fd..9542936 100644
--- a/extras/libmemif/src/memif_private.h
+++ b/extras/libmemif/src/memif_private.h
@@ -193,7 +193,7 @@
   int fd;
   uint16_t use_count;
   memif_socket_type_t type;
-  uint8_t *filename;
+  uint8_t filename[108];
   /* unique database */
   struct libmemif_main *lm;
   uint16_t interface_list_len;