From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id A36BE5F0F for ; Mon, 30 Jul 2018 18:21:53 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAsg-00009D-2f; Mon, 30 Jul 2018 16:18:46 +0000 From: Christian Ehrhardt To: Remy Horton Cc: Ferruh Yigit , dpdk stable Date: Mon, 30 Jul 2018 18:13:36 +0200 Message-Id: <20180730161342.16566-171-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com> References: <20180730161342.16566-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] patch 'metrics: disallow null as metric name' has been queued to stable release 18.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 16:21:53 -0000 Hi, FYI, your patch has been queued to stable release 18.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/01/18. So please shout if anyone has objections. Thanks. Christian Ehrhardt --- >>From 5eee77dcb8b4491167ded34b8a2bbfd5f618bdf0 Mon Sep 17 00:00:00 2001 From: Remy Horton Date: Mon, 2 Jul 2018 14:46:08 +0100 Subject: [PATCH] metrics: disallow null as metric name [ upstream commit 219731302a0aa5b8edb30a6bc1cdea64e7824a98 ] This patch adds a sanity check so that names passed into rte_metrics_reg_names() and the wrapper rte_metrics_reg_name() cannot be NULL. Fixes: 349950ddb9c5 ("metrics: add information metrics library") Signed-off-by: Remy Horton Acked-by: Ferruh Yigit --- lib/librte_metrics/rte_metrics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_metrics/rte_metrics.c b/lib/librte_metrics/rte_metrics.c index 038f58bf8..99a96b651 100644 --- a/lib/librte_metrics/rte_metrics.c +++ b/lib/librte_metrics/rte_metrics.c @@ -96,6 +96,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) -- 2.17.1