b381e82182
sync patches from 22.07 for hns3, dma and testpmd etc. Signed-off-by: Dongdong Liu <liudongdong3@huawei.com> (cherry picked from commit 7beb6a72fff2920a2d993030b0b02822249707fb)
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From bfe03dd331bcfda1ab9fcbe32305eb515b5d7e32 Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Fri, 13 May 2022 10:53:56 +0800
|
|
Subject: [PATCH 094/122] ethdev: fix possible null pointer access
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The rte_tel_data_alloc() may return NULL, so the caller should add
|
|
judgement for it.
|
|
|
|
Fixes: 083b0b310b19 ("ethdev: add common stats for telemetry")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Acked-by: Morten Brørup <mb@smartsharesystems.com>
|
|
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
|
|
---
|
|
lib/ethdev/rte_ethdev.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
|
|
index 1db59d3a0e..e55d11937e 100644
|
|
--- a/lib/ethdev/rte_ethdev.c
|
|
+++ b/lib/ethdev/rte_ethdev.c
|
|
@@ -6166,6 +6166,8 @@ eth_dev_add_port_queue_stats(struct rte_tel_data *d, uint64_t *q_stats,
|
|
{
|
|
int q;
|
|
struct rte_tel_data *q_data = rte_tel_data_alloc();
|
|
+ if (q_data == NULL)
|
|
+ return;
|
|
rte_tel_data_start_array(q_data, RTE_TEL_U64_VAL);
|
|
for (q = 0; q < RTE_ETHDEV_QUEUE_STAT_CNTRS; q++)
|
|
rte_tel_data_add_array_u64(q_data, q_stats[q]);
|
|
--
|
|
2.22.0
|
|
|