[dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[Fan Zhang]

Coverity issue: 272572
Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 examples/ip_pipeline/action.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
index 77a04fe19..91011ebe8 100644
--- a/examples/ip_pipeline/action.c
+++ b/examples/ip_pipeline/action.c
@@ -133,7 +133,7 @@ port_in_action_profile_create(const char *name,
 	}
 
 	/* Node fill in */
-	strncpy(profile->name, name, sizeof(profile->name));
+	strncpy(profile->name, name, sizeof(profile->name) - 1);
 	memcpy(&profile->params, params, sizeof(*params));
 	profile->ap = ap;
 
-- 
2.13.6

Re: [dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[Bruce Richardson]

On Mon, Apr 16, 2018 at 12:02:33PM +0100, Fan Zhang wrote:
> Coverity issue: 272572
> Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>  examples/ip_pipeline/action.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
> index 77a04fe19..91011ebe8 100644
> --- a/examples/ip_pipeline/action.c
> +++ b/examples/ip_pipeline/action.c
> @@ -133,7 +133,7 @@ port_in_action_profile_create(const char *name,
>  	}
>  
>  	/* Node fill in */
> -	strncpy(profile->name, name, sizeof(profile->name));
> +	strncpy(profile->name, name, sizeof(profile->name) - 1);
>  	memcpy(&profile->params, params, sizeof(*params));
>  	profile->ap = ap;

No, this still doesn't null terminate, and is a perfect example of why we
should never use strncpy! Use strlcpy instead.

[dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated

[Fan Zhang]

Coverity issue: 272572
Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
v2:
- use more generic strlcpy approach

 examples/ip_pipeline/action.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
index 77a04fe19..1203bb892 100644
--- a/examples/ip_pipeline/action.c
+++ b/examples/ip_pipeline/action.c
@@ -6,6 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <rte_string_fns.h>
+
 #include "action.h"
 #include "hash_func.h"
 
@@ -133,7 +135,7 @@ port_in_action_profile_create(const char *name,
 	}
 
 	/* Node fill in */
-	strncpy(profile->name, name, sizeof(profile->name));
+	strlcpy(profile->name, name, sizeof(profile->name));
 	memcpy(&profile->params, params, sizeof(*params));
 	profile->ap = ap;
 
-- 
2.13.6

Re: [dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated

[Bruce Richardson]

On Tue, Apr 17, 2018 at 10:52:52AM +0100, Fan Zhang wrote:
> Coverity issue: 272572
> Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> v2:
> - use more generic strlcpy approach
> 
>  examples/ip_pipeline/action.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
> index 77a04fe19..1203bb892 100644
> --- a/examples/ip_pipeline/action.c
> +++ b/examples/ip_pipeline/action.c
> @@ -6,6 +6,8 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> +#include <rte_string_fns.h>
> +
>  #include "action.h"
>  #include "hash_func.h"
>  
> @@ -133,7 +135,7 @@ port_in_action_profile_create(const char *name,
>  	}
>  
>  	/* Node fill in */
> -	strncpy(profile->name, name, sizeof(profile->name));
> +	strlcpy(profile->name, name, sizeof(profile->name));
>  	memcpy(&profile->params, params, sizeof(*params));
>  	profile->ap = ap;
>  
>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Monday, April 16, 2018 12:03 PM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Singh, Jasvinder
> <jasvinder.singh@intel.com>
> Subject: [PATCH] examples/ip_pipeline: fix buffer not null terminated
> 
> Coverity issue: 272572
> Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>  examples/ip_pipeline/action.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
> index 77a04fe19..91011ebe8 100644
> --- a/examples/ip_pipeline/action.c
> +++ b/examples/ip_pipeline/action.c
> @@ -133,7 +133,7 @@ port_in_action_profile_create(const char *name,
>  	}
> 
>  	/* Node fill in */
> -	strncpy(profile->name, name, sizeof(profile->name));
> +	strncpy(profile->name, name, sizeof(profile->name) - 1);
>  	memcpy(&profile->params, params, sizeof(*params));
>  	profile->ap = ap;
> 
> --
> 2.13.6

Acked-by: Cristian.Dumitrescu <cristian.dumitrescu@intel.com>

Applied to next-pipeline tree, thanks!

Re: [dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[Bruce Richardson]

On Tue, May 08, 2018 at 02:28:25PM +0000, Dumitrescu, Cristian wrote:
> 
> 
> > -----Original Message-----
> > From: Zhang, Roy Fan
> > Sent: Monday, April 16, 2018 12:03 PM
> > To: dev@dpdk.org
> > Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Singh, Jasvinder
> > <jasvinder.singh@intel.com>
> > Subject: [PATCH] examples/ip_pipeline: fix buffer not null terminated
> > 
> > Coverity issue: 272572
> > Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
> > 
> > Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> > ---
> >  examples/ip_pipeline/action.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
> > index 77a04fe19..91011ebe8 100644
> > --- a/examples/ip_pipeline/action.c
> > +++ b/examples/ip_pipeline/action.c
> > @@ -133,7 +133,7 @@ port_in_action_profile_create(const char *name,
> >  	}
> > 
> >  	/* Node fill in */
> > -	strncpy(profile->name, name, sizeof(profile->name));
> > +	strncpy(profile->name, name, sizeof(profile->name) - 1);
> >  	memcpy(&profile->params, params, sizeof(*params));
> >  	profile->ap = ap;
> > 
> > --
> > 2.13.6
> 
> Acked-by: Cristian.Dumitrescu <cristian.dumitrescu@intel.com>
> 
> Applied to next-pipeline tree, thanks!

This is not a correct fix, and the code is still broken. However, I see
that you have actually applied the correct v2 patch to the tree, so no big
deal. It's probably best to reply to the correct patch confirming it's
applied, though.

/Bruce

Re: [dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null terminated

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Tuesday, May 8, 2018 8:51 PM
> To: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> Cc: Zhang, Roy Fan <roy.fan.zhang@intel.com>; dev@dpdk.org; Singh,
> Jasvinder <jasvinder.singh@intel.com>
> Subject: Re: [dpdk-dev] [PATCH] examples/ip_pipeline: fix buffer not null
> terminated
> 
> On Tue, May 08, 2018 at 02:28:25PM +0000, Dumitrescu, Cristian wrote:
> >
> >
> > > -----Original Message-----
> > > From: Zhang, Roy Fan
> > > Sent: Monday, April 16, 2018 12:03 PM
> > > To: dev@dpdk.org
> > > Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Singh,
> Jasvinder
> > > <jasvinder.singh@intel.com>
> > > Subject: [PATCH] examples/ip_pipeline: fix buffer not null terminated
> > >
> > > Coverity issue: 272572
> > > Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
> > >
> > > Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> > > ---
> > >  examples/ip_pipeline/action.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/examples/ip_pipeline/action.c
> b/examples/ip_pipeline/action.c
> > > index 77a04fe19..91011ebe8 100644
> > > --- a/examples/ip_pipeline/action.c
> > > +++ b/examples/ip_pipeline/action.c
> > > @@ -133,7 +133,7 @@ port_in_action_profile_create(const char
> *name,
> > >  	}
> > >
> > >  	/* Node fill in */
> > > -	strncpy(profile->name, name, sizeof(profile->name));
> > > +	strncpy(profile->name, name, sizeof(profile->name) - 1);
> > >  	memcpy(&profile->params, params, sizeof(*params));
> > >  	profile->ap = ap;
> > >
> > > --
> > > 2.13.6
> >
> > Acked-by: Cristian.Dumitrescu <cristian.dumitrescu@intel.com>
> >
> > Applied to next-pipeline tree, thanks!
> 
> This is not a correct fix, and the code is still broken. However, I see
> that you have actually applied the correct v2 patch to the tree, so no big
> deal. It's probably best to reply to the correct patch confirming it's
> applied, though.
> 
> /Bruce

Yes, the right patch (v2) was applied, the wrong email was replied.

Re: [dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Singh, Jasvinder
> Sent: Tuesday, April 17, 2018 5:40 PM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>
> Subject: [PATCH v2] examples/ip_pipeline: fix buffer not null terminated
> 
> The destination string may not have a null termination if
> the source string's length is equal to the sizeof(pipeline->name).
> 
> Fix by replacing strncpy with strlcpy that guarantees NULL-termination.
> 
> Coverty issue: 272606
> Fixes: d75c371e9b46 ("examples/ip_pipeline: add pipeline object")
> 
> Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  examples/ip_pipeline/pipeline.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/examples/ip_pipeline/pipeline.c
> b/examples/ip_pipeline/pipeline.c
> index 76aa1d3..43fe867 100644
> --- a/examples/ip_pipeline/pipeline.c
> +++ b/examples/ip_pipeline/pipeline.c
> @@ -9,6 +9,7 @@
>  #include <rte_ip.h>
>  #include <rte_tcp.h>
> 
> +#include <rte_string_fns.h>
>  #include <rte_port_ethdev.h>
>  #ifdef RTE_LIBRTE_KNI
>  #include <rte_port_kni.h>
> @@ -129,7 +130,7 @@ pipeline_create(const char *name, struct
> pipeline_params *params)
>  	}
> 
>  	/* Node fill in */
> -	strncpy(pipeline->name, name, sizeof(pipeline->name));
> +	strlcpy(pipeline->name, name, sizeof(pipeline->name));
>  	pipeline->p = p;
>  	pipeline->n_ports_in = 0;
>  	pipeline->n_ports_out = 0;
> --
> 2.9.3
Acked-by: Cristian.Dumitrescu <cristian.dumitrescu@intel.com>

Applied to next-pipeline tree, thanks!

Re: [dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated.

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Tuesday, April 17, 2018 10:46 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Singh, Jasvinder
> <jasvinder.singh@intel.com>
> Subject: [PATCH v2] examples/ip_pipeline: fix buffer not null terminated.
> 
> Coverity issue: 272563
> Fixes: 8245472c58c8 ("examples/ip_pipeline: add sw queue object")
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
> v2:
> - using more generic strlcpy approach
> 
>  examples/ip_pipeline/swq.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/examples/ip_pipeline/swq.c b/examples/ip_pipeline/swq.c
> index c11bbf27e..7e54a1dbf 100644
> --- a/examples/ip_pipeline/swq.c
> +++ b/examples/ip_pipeline/swq.c
> @@ -5,6 +5,8 @@
>  #include <stdlib.h>
>  #include <string.h>
> 
> +#include <rte_string_fns.h>
> +
>  #include "swq.h"
> 
>  static struct swq_list swq_list;
> @@ -64,7 +66,7 @@ swq_create(const char *name, struct swq_params
> *params)
>  	}
> 
>  	/* Node fill in */
> -	strncpy(swq->name, name, sizeof(swq->name));
> +	strlcpy(swq->name, name, sizeof(swq->name));
>  	swq->r = r;
> 
>  	/* Node add to list */
> --
> 2.13.6
Acked-by: Cristian.Dumitrescu <cristian.dumitrescu@intel.com>

Applied to next-pipeline tree, thanks!

[dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated

[Jasvinder Singh]

The destination string may not have a null termination if
the source string's length is equal to the sizeof(pipeline->name).

Fix by replacing strncpy with strlcpy that guarantees NULL-termination.

Coverty issue: 272606
Fixes: d75c371e9b46 ("examples/ip_pipeline: add pipeline object")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/ip_pipeline/pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/ip_pipeline/pipeline.c b/examples/ip_pipeline/pipeline.c
index 76aa1d3..43fe867 100644
--- a/examples/ip_pipeline/pipeline.c
+++ b/examples/ip_pipeline/pipeline.c
@@ -9,6 +9,7 @@
 #include <rte_ip.h>
 #include <rte_tcp.h>
 
+#include <rte_string_fns.h>
 #include <rte_port_ethdev.h>
 #ifdef RTE_LIBRTE_KNI
 #include <rte_port_kni.h>
@@ -129,7 +130,7 @@ pipeline_create(const char *name, struct pipeline_params *params)
 	}
 
 	/* Node fill in */
-	strncpy(pipeline->name, name, sizeof(pipeline->name));
+	strlcpy(pipeline->name, name, sizeof(pipeline->name));
 	pipeline->p = p;
 	pipeline->n_ports_in = 0;
 	pipeline->n_ports_out = 0;
-- 
2.9.3

Re: [dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated.

[Bruce Richardson]

On Tue, Apr 17, 2018 at 10:45:46AM +0100, Fan Zhang wrote:
> Coverity issue: 272563
> Fixes: 8245472c58c8 ("examples/ip_pipeline: add sw queue object")
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

[dpdk-dev] [PATCH v2] examples/ip_pipeline: fix buffer not null terminated.

[Fan Zhang]

Coverity issue: 272563
Fixes: 8245472c58c8 ("examples/ip_pipeline: add sw queue object")

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
v2:
- using more generic strlcpy approach 

 examples/ip_pipeline/swq.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/ip_pipeline/swq.c b/examples/ip_pipeline/swq.c
index c11bbf27e..7e54a1dbf 100644
--- a/examples/ip_pipeline/swq.c
+++ b/examples/ip_pipeline/swq.c
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <rte_string_fns.h>
+
 #include "swq.h"
 
 static struct swq_list swq_list;
@@ -64,7 +66,7 @@ swq_create(const char *name, struct swq_params *params)
 	}
 
 	/* Node fill in */
-	strncpy(swq->name, name, sizeof(swq->name));
+	strlcpy(swq->name, name, sizeof(swq->name));
 	swq->r = r;
 
 	/* Node add to list */
-- 
2.13.6