d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

null: fix memory leak of kvargs

Browse Source 
'struct rte_kvargs' is allocated in rte_kvargs_parse(), and should be
freed with rte_kvargs_free().

Reported-by: John Mcnamara <john.mcnamara@intel.com>
Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
This commit is contained in:
Tetsuya Mukawa 2015-03-17 13:12:41 +09:00 committed by Thomas Monjalon
parent 8eb680e452
commit 6e225d6a21
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/librte_pmd_null/rte_eth_null.c
View File

@ -506,7 +506,7 @@ rte_pmd_null_devinit(const char *name, const char *params)
unsigned numa_node; unsigned numa_node;
unsigned packet_size = default_packet_size; unsigned packet_size = default_packet_size;
unsigned packet_copy = default_packet_copy; unsigned packet_copy = default_packet_copy;
struct rte_kvargs *kvlist; struct rte_kvargs *kvlist = NULL;
int ret; int ret;
if (name == NULL) if (name == NULL)
@ -527,7 +527,7 @@ rte_pmd_null_devinit(const char *name, const char *params)
ETH_NULL_PACKET_SIZE_ARG, ETH_NULL_PACKET_SIZE_ARG,
&get_packet_size_arg, &packet_size); &get_packet_size_arg, &packet_size);
if (ret < 0) if (ret < 0)
return -1; goto free_kvlist;
} }
if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_COPY_ARG) == 1) { if (rte_kvargs_count(kvlist, ETH_NULL_PACKET_COPY_ARG) == 1) {
@ -536,7 +536,7 @@ rte_pmd_null_devinit(const char *name, const char *params)
ETH_NULL_PACKET_COPY_ARG, ETH_NULL_PACKET_COPY_ARG,
&get_packet_copy_arg, &packet_copy); &get_packet_copy_arg, &packet_copy);
if (ret < 0) if (ret < 0)
return -1; goto free_kvlist;
} }
} }
@ -544,7 +544,12 @@ rte_pmd_null_devinit(const char *name, const char *params)
"packet copy is %s\n", packet_size, "packet copy is %s\n", packet_size,
packet_copy ? "enabled" : "disabled"); packet_copy ? "enabled" : "disabled");
return eth_dev_null_create(name, numa_node, packet_size, packet_copy); ret = eth_dev_null_create(name, numa_node, packet_size, packet_copy);
free_kvlist:
if (kvlist)
rte_kvargs_free(kvlist);
return ret;
} }
static int static int