From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id C9C3CA04DD
for <public@inbox.dpdk.org>; Wed, 18 Nov 2020 17:36:29 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D9CB5F90;
Wed, 18 Nov 2020 17:36:27 +0100 (CET)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [216.205.24.124])
by dpdk.org (Postfix) with ESMTP id 2CBB5F90
for <stable@dpdk.org>; Wed, 18 Nov 2020 17:36:27 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1605717385;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=ZerAvJ2FyE5bEKxTmoMCpctZuOZKntRmofngV7XjPOg=;
b=aUgvgJGMpn/f/bIc1gdnnB/xAoecpRJSbs+g32K6dbN1lD7/QatE68EzhsQo7IkFGEpE95
wEl62b/eApVJvntnHADKFEgbss2svJXDCeFRncjpS1cSzdPR8dzA05wQoniyfYSVsEwsQ+
4WtRVVm5tlzsXpkvlR6YYyY8cnlwS38=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-489-gtGUsflxMnmSf5RAyuZ08Q-1; Wed, 18 Nov 2020 11:36:21 -0500
X-MC-Unique: gtGUsflxMnmSf5RAyuZ08Q-1
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E55F1005E45;
Wed, 18 Nov 2020 16:36:20 +0000 (UTC)
Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249])
by smtp.corp.redhat.com (Postfix) with ESMTP id 839164D702;
Wed, 18 Nov 2020 16:36:18 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Yunjian Wang <wangyunjian@huawei.com>
Cc: Nikhil Rao <nikhil.rao@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Wed, 18 Nov 2020 16:34:49 +0000
Message-Id: <20201118163558.1101823-3-ktraynor@redhat.com>
In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com>
References: <20201118163558.1101823-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Subject: [dpdk-stable] patch 'eventdev: check allocation in Tx adapter' has
been queued to LTS release 18.11.11
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to LTS release 18.11.11
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/24/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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e7e94ae2f890618a9b9260fa1e7ccfa6ae8aaa26
Thanks.
Kevin.
---
>From e7e94ae2f890618a9b9260fa1e7ccfa6ae8aaa26 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@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@huawei.com>
Reviewed-by: Nikhil Rao <nikhil.rao@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 67216a3058..c30fe1b025 100644
--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
@@ -734,4 +734,6 @@ 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++) {
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-18 16:33:38.053559975 +0000
+++ 0003-eventdev-check-allocation-in-Tx-adapter.patch 2020-11-18 16:33:37.896215041 +0000
@@ -1 +1 @@
-From e3eebdced05c471327353a773640fec929cb298b Mon Sep 17 00:00:00 2001
+From e7e94ae2f890618a9b9260fa1e7ccfa6ae8aaa26 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e3eebdced05c471327353a773640fec929cb298b ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index bb21dc4075..86287b4e66 100644
+index 67216a3058..c30fe1b025 100644
@@ -22 +23 @@
-@@ -735,4 +735,6 @@ txa_service_queue_add(uint8_t id,
+@@ -734,4 +734,6 @@ txa_service_queue_add(uint8_t id,