examples/ip_pipeline: replace strncpy with strlcpy

The destination string may not have a null termination if
the source string's length is equal to the sizeof.

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

[merged several commits]

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>
Coverty issue: 272594
Fixes: 133c2c6565d6 ("examples/ip_pipeline: add link object")
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Coverty issue: 272603
Fixes: 2f74ae28e23f ("examples/ip_pipeline: add tap object")
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Coverity issue: 272588
Fixes: 6bfe74f8c93e ("examples/ip_pipeline: add mempool object")
Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Reviewed-by: Jasvinder Singh <jasvinder.singh@intel.com>
Coverity issue: 272592
Fixes: 25961ff3bcb9 ("examples/ip_pipeline: add traffic manager object")
Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Reviewed-by: Jasvinder Singh <jasvinder.singh@intel.com>
Coverity issue: 272562
Fixes: 9a408cc8ac ("examples/ip_pipeline: add KNI object")
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
Reviewed-by: Jasvinder Singh <jasvinder.singh@intel.com>
Coverity issue: 272580
Fixes: 719374345c ("examples/ip_pipeline: add action profile objects")
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
Reviewed-by: Jasvinder Singh <jasvinder.singh@intel.com>
Coverity issue: 272572
Fixes: 719374345cee ("examples/ip_pipeline: add action profile objects")
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
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>

diff --git a/examples/ip_pipeline/action.c b/examples/ip_pipeline/action.c
index 77a04fe19dbc892232e41cd32b0af4bfcd1ca4b0..a29c2b368f3a6088bd33bd437b7718a967b13f7e 100644 (file)
--- 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;
 
@@ -345,7 +347,7 @@ table_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;
 

diff --git a/examples/ip_pipeline/kni.c b/examples/ip_pipeline/kni.c
index ed5f8942e21869e90b5268e369cfc1971a611833..7e5ff0543a35339bccdb4b85545ba744b8c23c81 100644 (file)
--- a/examples/ip_pipeline/kni.c
+++ b/examples/ip_pipeline/kni.c
@@ -7,6 +7,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_bus_pci.h>
+#include <rte_string_fns.h>
 
 #include "kni.h"
 #include "mempool.h"
@@ -153,7 +154,7 @@ kni_create(const char *name, struct kni_params *params)
                return NULL;
 
        /* Node fill in */
-       strncpy(kni->name, name, sizeof(kni->name));
+       strlcpy(kni->name, name, sizeof(kni->name));
        kni->k = k;
 
        /* Node add to list */

diff --git a/examples/ip_pipeline/link.c b/examples/ip_pipeline/link.c
index 26ff41ba9c9bb81a95dc55d641555c42b4e1dfa5..b8a431f3e0cbc4c8d9e1091a19d403c5a99cded9 100644 (file)
--- a/examples/ip_pipeline/link.c
+++ b/examples/ip_pipeline/link.c
@@ -6,6 +6,7 @@
 #include <string.h>
 
 #include <rte_ethdev.h>
+#include <rte_string_fns.h>
 
 #include "link.h"
 #include "mempool.h"
@@ -236,7 +237,7 @@ link_create(const char *name, struct link_params *params)
        }
 
        /* Node fill in */
-       strncpy(link->name, name, sizeof(link->name));
+       strlcpy(link->name, name, sizeof(link->name));
        link->port_id = port_id;
        link->n_rxq = params->rx.n_queues;
        link->n_txq = params->tx.n_queues;

diff --git a/examples/ip_pipeline/mempool.c b/examples/ip_pipeline/mempool.c
index 33b92433971f637880e93be8ae20d16db8a354ee..f5d2a7d108daa96cc7b9514dc5df682d22cf672a 100644 (file)
--- a/examples/ip_pipeline/mempool.c
+++ b/examples/ip_pipeline/mempool.c
@@ -6,6 +6,7 @@
 #include <string.h>
 
 #include <rte_mbuf.h>
+#include <rte_string_fns.h>
 
 #include "mempool.h"
 
@@ -70,7 +71,7 @@ mempool_create(const char *name, struct mempool_params *params)
        }
 
        /* Node fill in */
-       strncpy(mempool->name, name, sizeof(mempool->name));
+       strlcpy(mempool->name, name, sizeof(mempool->name));
        mempool->m = m;
        mempool->buffer_size = params->buffer_size;
 

diff --git a/examples/ip_pipeline/pipeline.c b/examples/ip_pipeline/pipeline.c
index 76aa1d3a9ac61af20208bfdafae118bf734e19e1..43fe8677a5895799a4dd6527384c133175aa768f 100644 (file)
--- 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;

diff --git a/examples/ip_pipeline/swq.c b/examples/ip_pipeline/swq.c
index c11bbf27e32de2f228a50231e081be1eb604d974..7e54a1dbfe0428e26a5ba77a40f469a465c2f75b 100644 (file)
--- 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 */

diff --git a/examples/ip_pipeline/tap.c b/examples/ip_pipeline/tap.c
index a0f60867f7546ff7d69b6d82a12700a2e7fca4ca..11e4ad20e24f0a8092b5a492657f5e72db38e582 100644 (file)
--- a/examples/ip_pipeline/tap.c
+++ b/examples/ip_pipeline/tap.c
@@ -15,6 +15,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <rte_string_fns.h>
+
 #include "tap.h"
 
 #define TAP_DEV                                            "/dev/net/tun"
@@ -88,7 +90,7 @@ tap_create(const char *name)
                return NULL;
        }
        /* Node fill in */
-       strncpy(tap->name, name, sizeof(tap->name));
+       strlcpy(tap->name, name, sizeof(tap->name));
        tap->fd = fd;
 
        /* Node add to list */

diff --git a/examples/ip_pipeline/tmgr.c b/examples/ip_pipeline/tmgr.c
index b46ca96db285e8c25184a40d784e9c0a6a4a3691..40cbf1d0a2174d6fb89c8a37a2d06c4c49806a0b 100644 (file)
--- a/examples/ip_pipeline/tmgr.c
+++ b/examples/ip_pipeline/tmgr.c
@@ -4,6 +4,8 @@
 
 #include <stdlib.h>
 
+#include <rte_string_fns.h>
+
 #include "tmgr.h"
 
 static struct rte_sched_subport_params
@@ -148,7 +150,7 @@ tmgr_port_create(const char *name, struct tmgr_port_params *params)
        }
 
        /* Node fill in */
-       strncpy(tmgr_port->name, name, sizeof(tmgr_port->name));
+       strlcpy(tmgr_port->name, name, sizeof(tmgr_port->name));
        tmgr_port->s = s;
        tmgr_port->n_subports_per_port = params->n_subports_per_port;
        tmgr_port->n_pipes_per_subport = params->n_pipes_per_subport;