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

metrics: fix potential missing string termination

Browse Source 
Fixes a potential memory overrun detected by Coverity.
This overrun cannot currently happen in practice because
rte_metrics_reg_names() explicitly forces the last name
character to be a NULL terminator.

This patches uses strlcpy instead of strncpy to copy name strings.

Coverity issue: 143434
Fixes: 349950ddb9c5 ("metrics: add information metrics library")
Fixes: 710cab6f675a ("metrics: fix out of bound access")

Signed-off-by: Remy Horton <remy.horton@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Remy Horton 2018-02-20 16:05:59 +00:00 committed by Thomas Monjalon
parent c022cb400e
commit 255d42d5b6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/librte_metrics/rte_metrics.c
View File

@ -6,6 +6,7 @@
#include <sys/queue.h>
#include <rte_common.h>
#include <rte_string_fns.h>
#include <rte_malloc.h>
#include <rte_metrics.h>
#include <rte_lcore.h>
@ -113,10 +114,7 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
for (idx_name = 0; idx_name < cnt_names; idx_name++) {
entry = &stats->metadata[idx_name + stats->cnt_stats];
strncpy(entry->name, names[idx_name],
RTE_METRICS_MAX_NAME_LEN);
/* Enforce NULL-termination */
entry->name[RTE_METRICS_MAX_NAME_LEN - 1] = '\0';
strlcpy(entry->name, names[idx_name], RTE_METRICS_MAX_NAME_LEN);
memset(entry->value, 0, sizeof(entry->value));
entry->idx_next_stat = idx_name + stats->cnt_stats + 1;
}
@ -215,7 +213,7 @@ rte_metrics_get_names(struct rte_metric_name *names,
return return_value;
}
for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++)
strncpy(names[idx_name].name,
strlcpy(names[idx_name].name,
stats->metadata[idx_name].name,
RTE_METRICS_MAX_NAME_LEN);
}