* [dpdk-dev] [PATCH v2 1/2] rte_mbuf: fix strncpy warnings
2018-03-29 16:55 [dpdk-dev] [PATCH v2 0/2] gcc-9 build fixes Stephen Hemminger
@ 2018-03-29 16:55 ` Stephen Hemminger
2018-03-29 16:55 ` [dpdk-dev] [PATCH v2 2/2] rte_metrics: fix strncpy truncation warning Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2018-03-29 16:55 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
Gcc-8 discovers issue with platform_mempool_ops.
rte_mbuf_pool_ops.c:26:3: error: ‘strncpy’ output truncated before
terminating nul copying as many bytes from a string as its length
[-Werror=stringop-truncation]
strncpy(mz->addr, ops_name, strlen(ops_name));
Since the ops_name is already checked for size, using strncpy
here is unnecessary; just use strcpy.
Fixes: a3acc3144a76 ("mbuf: add pool ops selection functions")
---
lib/librte_mbuf/rte_mbuf_pool_ops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf_pool_ops.c b/lib/librte_mbuf/rte_mbuf_pool_ops.c
index 48cc342002a5..a1d4699f67fe 100644
--- a/lib/librte_mbuf/rte_mbuf_pool_ops.c
+++ b/lib/librte_mbuf/rte_mbuf_pool_ops.c
@@ -23,7 +23,7 @@ rte_mbuf_set_platform_mempool_ops(const char *ops_name)
RTE_MEMPOOL_OPS_NAMESIZE, SOCKET_ID_ANY, 0);
if (mz == NULL)
return -rte_errno;
- strncpy(mz->addr, ops_name, strlen(ops_name));
+ strcpy(mz->addr, ops_name);
return 0;
} else if (strcmp(mz->addr, ops_name) == 0) {
return 0;
@@ -62,7 +62,7 @@ rte_mbuf_set_user_mempool_ops(const char *ops_name)
return -rte_errno;
}
- strncpy(mz->addr, ops_name, strlen(ops_name));
+ strcpy(mz->addr, ops_name);
return 0;
}
--
2.16.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-dev] [PATCH v2 2/2] rte_metrics: fix strncpy truncation warning
2018-03-29 16:55 [dpdk-dev] [PATCH v2 0/2] gcc-9 build fixes Stephen Hemminger
2018-03-29 16:55 ` [dpdk-dev] [PATCH v2 1/2] rte_mbuf: fix strncpy warnings Stephen Hemminger
@ 2018-03-29 16:55 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2018-03-29 16:55 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
Fixes:
librte_metrics/rte_metrics.c:218:4: error: ‘strncpy’ specified
bound 64 equals destination size [-Werror=stringop-truncation]
strncpy(names[idx_name].name,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
stats->metadata[idx_name].name,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
RTE_METRICS_MAX_NAME_LEN);
~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_metrics/rte_metrics.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/librte_metrics/rte_metrics.c b/lib/librte_metrics/rte_metrics.c
index 556ae1ba8b4d..e0f803ef0880 100644
--- a/lib/librte_metrics/rte_metrics.c
+++ b/lib/librte_metrics/rte_metrics.c
@@ -214,10 +214,13 @@ rte_metrics_get_names(struct rte_metric_name *names,
rte_spinlock_unlock(&stats->lock);
return return_value;
}
- for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++)
+
+ for (idx_name = 0; idx_name < stats->cnt_stats; idx_name++) {
strncpy(names[idx_name].name,
stats->metadata[idx_name].name,
- RTE_METRICS_MAX_NAME_LEN);
+ RTE_METRICS_MAX_NAME_LEN - 1);
+ names[idx_name].name[RTE_METRICS_MAX_NAME_LEN - 1] = '\0';
+ }
}
return_value = stats->cnt_stats;
rte_spinlock_unlock(&stats->lock);
--
2.16.2
^ permalink raw reply [flat|nested] 3+ messages in thread