New upstream version 18.02

[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..556ae1b 100644 (file)
--- a/lib/librte_metrics/rte_metrics.c
+++ b/lib/librte_metrics/rte_metrics.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <string.h>
@@ -115,7 +86,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;
@@ -144,6 +115,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 +149,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)
@@ -263,7 +236,7 @@ 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);