[v12,4/4] performance-thread: Fix cross compilation failed
Checks
Commit Message
From: Zhihong Peng <zhihongx.peng@intel.com>
The gcc(arm-linux-gcc) will check code more stricter when ASan enabled.
"strncpy specified bound XX equals destination size" error occurs here.
Fixes: 116819b9ed0d ("examples/performance-thread: add lthread subsystem")
Cc: stable@dpdk.org
Signed-off-by: Xueqin Lin <xueqin.lin@intel.com>
Signed-off-by: Zhihong Peng <zhihongx.peng@intel.com>
---
v11: Use rte_strlcpy to replace strncpy.
v12: Delete rte_strlcpy's rte_.
---
examples/performance-thread/common/lthread.c | 4 ++--
examples/performance-thread/common/lthread_cond.c | 6 +++---
examples/performance-thread/common/lthread_mutex.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
@@ -20,6 +20,7 @@
#include <sys/mman.h>
#include <rte_log.h>
+#include <rte_string_fns.h>
#include <ctx.h>
#include <stack.h>
@@ -463,6 +464,5 @@ void lthread_set_funcname(const char *f)
{
struct lthread *lt = THIS_LTHREAD;
- strncpy(lt->funcname, f, sizeof(lt->funcname));
- lt->funcname[sizeof(lt->funcname)-1] = 0;
+ strlcpy(lt->funcname, f, sizeof(lt->funcname));
}
@@ -20,6 +20,7 @@
#include <rte_log.h>
#include <rte_common.h>
+#include <rte_string_fns.h>
#include "lthread_api.h"
#include "lthread_diag_api.h"
@@ -57,10 +58,9 @@ lthread_cond_init(char *name, struct lthread_cond **cond,
}
if (name == NULL)
- strncpy(c->name, "no name", sizeof(c->name));
+ strlcpy(c->name, "no name", sizeof(c->name));
else
- strncpy(c->name, name, sizeof(c->name));
- c->name[sizeof(c->name)-1] = 0;
+ strlcpy(c->name, name, sizeof(c->name));
c->root_sched = THIS_SCHED;
@@ -19,6 +19,7 @@
#include <rte_log.h>
#include <rte_spinlock.h>
#include <rte_common.h>
+#include <rte_string_fns.h>
#include "lthread_api.h"
#include "lthread_int.h"
@@ -52,10 +53,9 @@ lthread_mutex_init(char *name, struct lthread_mutex **mutex,
}
if (name == NULL)
- strncpy(m->name, "no name", sizeof(m->name));
+ strlcpy(m->name, "no name", sizeof(m->name));
else
- strncpy(m->name, name, sizeof(m->name));
- m->name[sizeof(m->name)-1] = 0;
+ strlcpy(m->name, name, sizeof(m->name));
m->root_sched = THIS_SCHED;
m->owner = NULL;