ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmemif: socket filename length 108

Browse Source 
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
This commit is contained in:
Jakub Grajciar
2021-03-01 08:45:17 +01:00
committed by Damjan Marion
parent 0ac5782e60
commit 57084e5408
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extras/libmemif/src/main.c
View File

@ -948,13 +948,7 @@ memif_create_socket (memif_socket_handle_t * sock, const char *filename,
}
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 @@ memif_create_socket (memif_socket_handle_t * sock, const char *filename,
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 @@ memif_per_thread_create_socket (memif_per_thread_main_handle_t pt_main,
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 @@ memif_per_thread_create_socket (memif_per_thread_main_handle_t pt_main,
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 @@ memif_delete_socket (memif_socket_handle_t * sock)
lm->free (ms->interface_list);
ms->interface_list = NULL;
lm->free (ms->filename);
ms->filename = NULL;
lm->free (ms);
*sock = ms = NULL;

2
extras/libmemif/src/memif_private.h
View File

@ -193,7 +193,7 @@ typedef struct
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;