From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 256EDA0524 for ; Thu, 4 Feb 2021 12:35:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E87B240754; Thu, 4 Feb 2021 12:35:18 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id B7C9924072F for ; Thu, 4 Feb 2021 12:35:16 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cuo-0005OB-Jg; Thu, 04 Feb 2021 11:35:14 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Liron Himi , dpdk stable Date: Thu, 4 Feb 2021 12:28:17 +0100 Message-Id: <20210204112954.2488123-42-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvneta: check allocation in Rx queue flush' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5a599a8a67c927aa632c55f18b26dd080b0dcd5a Thanks. Christian Ehrhardt --- >From 5a599a8a67c927aa632c55f18b26dd080b0dcd5a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 7 Dec 2020 19:37:15 +0800 Subject: [PATCH] net/mvneta: check allocation in Rx queue flush [ upstream commit 565789662e7bc7608681cb93e3ccf7a4a2744f0b ] The function rte_malloc() could return NULL, the return value need to be checked. Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx") Signed-off-by: Yunjian Wang Acked-by: Liron Himi --- drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c index 10b6f57584..dfa7ecc090 100644 --- a/drivers/net/mvneta/mvneta_rxtx.c +++ b/drivers/net/mvneta/mvneta_rxtx.c @@ -872,7 +872,17 @@ mvneta_rx_queue_flush(struct mvneta_rxq *rxq) int ret, i; descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0); + if (descs == NULL) { + MVNETA_LOG(ERR, "Failed to allocate descs."); + return; + } + bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0); + if (bufs == NULL) { + MVNETA_LOG(ERR, "Failed to allocate bufs."); + rte_free(descs); + return; + } do { num = MRVL_NETA_RXD_MAX; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:29.870323167 +0100 +++ 0042-net-mvneta-check-allocation-in-Rx-queue-flush.patch 2021-02-04 12:04:27.954789655 +0100 @@ -1 +1 @@ -From 565789662e7bc7608681cb93e3ccf7a4a2744f0b Mon Sep 17 00:00:00 2001 +From 5a599a8a67c927aa632c55f18b26dd080b0dcd5a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 565789662e7bc7608681cb93e3ccf7a4a2744f0b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org