New upstream version 17.11.4

[deb_dpdk.git] / lib / librte_metrics / rte_metrics.c

diff --git a/lib/librte_metrics/rte_metrics.c b/lib/librte_metrics/rte_metrics.c
index e9a122c..dc63446 100644 (file)
--- a/lib/librte_metrics/rte_metrics.c
+++ b/lib/librte_metrics/rte_metrics.c
@@ -115,7 +115,7 @@ rte_metrics_reg_name(const char *name)
 int
 rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
 {
-       struct rte_metrics_meta_s *entry;
+       struct rte_metrics_meta_s *entry = NULL;
        struct rte_metrics_data_s *stats;
        const struct rte_memzone *memzone;
        uint16_t idx_name;
@@ -124,6 +124,9 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
        /* Some sanity checks */
        if (cnt_names < 1 || names == NULL)
                return -EINVAL;
+       for (idx_name = 0; idx_name < cnt_names; idx_name++)
+               if (names[idx_name] == NULL)
+                       return -EINVAL;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
        if (memzone == NULL)
@@ -144,6 +147,8 @@ rte_metrics_reg_names(const char * const *names, uint16_t cnt_names)
                entry = &stats->metadata[idx_name + stats->cnt_stats];
                strncpy(entry->name, names[idx_name],
                        RTE_METRICS_MAX_NAME_LEN);
+               /* Enforce NULL-termination */
+               entry->name[RTE_METRICS_MAX_NAME_LEN - 1] = '\0';
                memset(entry->value, 0, sizeof(entry->value));
                entry->idx_next_stat = idx_name + stats->cnt_stats + 1;
        }
@@ -176,7 +181,7 @@ rte_metrics_update_values(int port_id,
        uint16_t cnt_setsize;
 
        if (port_id != RTE_METRICS_GLOBAL &&
-                       (port_id < 0 || port_id > RTE_MAX_ETHPORTS))
+                       (port_id < 0 || port_id >= RTE_MAX_ETHPORTS))
                return -EINVAL;
 
        if (values == NULL)
@@ -188,6 +193,11 @@ rte_metrics_update_values(int port_id,
        stats = memzone->addr;
 
        rte_spinlock_lock(&stats->lock);
+
+       if (key >= stats->cnt_stats) {
+               rte_spinlock_unlock(&stats->lock);
+               return -EINVAL;
+       }
        idx_metric = key;
        cnt_setsize = 1;
        while (idx_metric < stats->cnt_stats) {
@@ -229,9 +239,8 @@ rte_metrics_get_names(struct rte_metric_name *names,
        int return_value;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
-       /* If not allocated, fail silently */
        if (memzone == NULL)
-               return 0;
+               return -EIO;
 
        stats = memzone->addr;
        rte_spinlock_lock(&stats->lock);
@@ -263,13 +272,13 @@ rte_metrics_get_values(int port_id,
        int return_value;
 
        if (port_id != RTE_METRICS_GLOBAL &&
-                       (port_id < 0 || port_id > RTE_MAX_ETHPORTS))
+                       (port_id < 0 || port_id >= RTE_MAX_ETHPORTS))
                return -EINVAL;
 
        memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
-       /* If not allocated, fail silently */
        if (memzone == NULL)
-               return 0;
+               return -EIO;
+
        stats = memzone->addr;
        rte_spinlock_lock(&stats->lock);