[dpdk-stable] patch 'examples/performance-thread: fix build with ASan' has been queued to stable release 20.11.4

[Xueming(Steven) Li]

Thanks for update, removed from list.


On Wed, 2021-11-10 at 07:27 +0000, Peng, ZhihongX wrote:
> Hi , Xueming
> 
> This patch is not backward compatible. 
> 
> Regards,
> Peng,Zhihong
> 
> > -----Original Message-----
> > From: Xueming Li <xuemingl at nvidia.com>
> > Sent: Wednesday, November 10, 2021 2:31 PM
> > To: Peng, ZhihongX <zhihongx.peng at intel.com>
> > Cc: Luca Boccassi <bluca at debian.org>; Lin, Xueqin <xueqin.lin at intel.com>;
> > Richardson, Bruce <bruce.richardson at intel.com>; dpdk stable
> > <stable at dpdk.org>
> > Subject: patch 'examples/performance-thread: fix build with ASan' has been
> > queued to stable release 20.11.4
> > 
> > Hi,
> > 
> > FYI, your patch has been queued to stable release 20.11.4
> > 
> > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> > It will be pushed if I get no objections before 11/12/21. So please shout if
> > anyone has objections.
> > 
> > Also note that after the patch there's a diff of the upstream commit vs the
> > patch applied to the branch. This will indicate if there was any rebasing
> > needed to apply to the stable branch. If there were code changes for
> > rebasing
> > (ie: not only metadata diffs), please double check that the rebase was
> > correctly done.
> > 
> > Queued patches are on a temporary branch at:
> > https://github.com/steevenlee/dpdk
> > 
> > This queued commit can be viewed at:
> > https://github.com/steevenlee/dpdk/commit/4b98552d4d3ca54ebc58014b4
> > 163e1164e2e4342
> > 
> > Thanks.
> > 
> > Xueming Li <xuemingl at nvidia.com>
> > 
> > ---
> > From 4b98552d4d3ca54ebc58014b4163e1164e2e4342 Mon Sep 17 00:00:00
> > 2001
> > From: Zhihong Peng <zhihongx.peng at intel.com>
> > Date: Wed, 20 Oct 2021 15:46:43 +0800
> > Subject: [PATCH] examples/performance-thread: fix build with ASan
> > Cc: Xueming Li <xuemingl at nvidia.com>
> > 
> > [ upstream commit 4d2d1258151657d69b0be5d118956b7e809f9d47 ]
> > 
> > Code changes to avoid the following build error:
> > "strncpy specified bound XX equals destination size".
> > 
> > Signed-off-by: Xueqin Lin <xueqin.lin at intel.com>
> > Signed-off-by: Zhihong Peng <zhihongx.peng at intel.com>
> > Acked-by: Bruce Richardson <bruce.richardson at intel.com>
> > ---
> >  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(-)
> > 
> > diff --git a/examples/performance-thread/common/lthread.c
> > b/examples/performance-thread/common/lthread.c
> > index 3f1f48db43..190e5874b1 100644
> > --- a/examples/performance-thread/common/lthread.c
> > +++ b/examples/performance-thread/common/lthread.c
> > @@ -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));
> >  }
> > diff --git a/examples/performance-thread/common/lthread_cond.c
> > b/examples/performance-thread/common/lthread_cond.c
> > index cdcc7a7b5a..e7be17089a 100644
> > --- a/examples/performance-thread/common/lthread_cond.c
> > +++ b/examples/performance-thread/common/lthread_cond.c
> > @@ -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;
> > 
> > diff --git a/examples/performance-thread/common/lthread_mutex.c
> > b/examples/performance-thread/common/lthread_mutex.c
> > index 01da6cad4f..709ab9f553 100644
> > --- a/examples/performance-thread/common/lthread_mutex.c
> > +++ b/examples/performance-thread/common/lthread_mutex.c
> > @@ -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;
> > --
> > 2.33.0
> > 
> > ---
> >   Diff of the applied patch vs upstream commit (please double-check if non-
> > empty:
> > ---
> > --- -	2021-11-10 14:17:10.858279926 +0800
> > +++ 0202-examples-performance-thread-fix-build-with-ASan.patch	2021-
> > 11-10 14:17:02.014078251 +0800
> > @@ -1 +1 @@
> > -From 4d2d1258151657d69b0be5d118956b7e809f9d47 Mon Sep 17 00:00:00
> > 2001
> > +From 4b98552d4d3ca54ebc58014b4163e1164e2e4342 Mon Sep 17 00:00:00
> > 2001
> > @@ -4,0 +5,3 @@
> > +Cc: Xueming Li <xuemingl at nvidia.com>
> > +
> > +[ upstream commit 4d2d1258151657d69b0be5d118956b7e809f9d47 ]
> > @@ -19 +22 @@
> > -index 98123f34f8..009374a8c3 100644
> > +index 3f1f48db43..190e5874b1 100644
> > @@ -30 +33 @@
> > -@@ -465,6 +466,5 @@ void lthread_set_funcname(const char *f)
> > +@@ -463,6 +464,5 @@ void lthread_set_funcname(const char *f)
> > @@ -64 +67 @@
> > -index 061fc5c19a..f3ec7c1c60 100644
> > +index 01da6cad4f..709ab9f553 100644