[dpdk-stable] patch 'eventdev: check allocation in Tx adapter' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From f939dab3507a6c03743baf16bbaeae6b5ff2b967 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Mon, 27 Jul 2020 22:03:14 +0800
Subject: [PATCH] eventdev: check allocation in Tx adapter

[ upstream commit e3eebdced05c471327353a773640fec929cb298b ]

The function rte_zmalloc() could return NULL, the return value
need to be checked.

Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Nikhil Rao <nikhil.rao at intel.com>
---
 lib/librte_eventdev/rte_event_eth_tx_adapter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
index d02ef57f4e..8a1573e75f 100644
--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
@@ -733,6 +733,8 @@ txa_service_queue_add(uint8_t id,
 
 		qdone = rte_zmalloc(txa->mem_name,
 				nb_queues * sizeof(*qdone), 0);
+		if (qdone == NULL)
+			return -ENOMEM;
 		j = 0;
 		for (i = 0; i < nb_queues; i++) {
 			if (txa_service_is_queue_added(txa, eth_dev, i))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.579157086 +0000
+++ 0156-eventdev-check-allocation-in-Tx-adapter.patch	2020-10-28 10:35:11.752833674 +0000
@@ -1,13 +1,14 @@
-From e3eebdced05c471327353a773640fec929cb298b Mon Sep 17 00:00:00 2001
+From f939dab3507a6c03743baf16bbaeae6b5ff2b967 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Mon, 27 Jul 2020 22:03:14 +0800
 Subject: [PATCH] eventdev: check allocation in Tx adapter
 
+[ upstream commit e3eebdced05c471327353a773640fec929cb298b ]
+
 The function rte_zmalloc() could return NULL, the return value
 need to be checked.
 
 Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Reviewed-by: Nikhil Rao <nikhil.rao at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
-index bb21dc4075..86287b4e66 100644
+index d02ef57f4e..8a1573e75f 100644
 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c
 +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
-@@ -734,6 +734,8 @@ txa_service_queue_add(uint8_t id,
+@@ -733,6 +733,8 @@ txa_service_queue_add(uint8_t id,
  
  		qdone = rte_zmalloc(txa->mem_name,
  				nb_queues * sizeof(*qdone), 0);