From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C5934A04DD for ; Wed, 28 Oct 2020 11:54:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BDFD9CA14; Wed, 28 Oct 2020 11:54:31 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by dpdk.org (Postfix) with ESMTP id 1A953CA14 for ; Wed, 28 Oct 2020 11:54:30 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id a72so4092443wme.5 for ; Wed, 28 Oct 2020 03:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J0TKGqOXFDjGZzMnLJlInB44KOxfde+y1qQafKgWPqM=; b=V45PP+yvw2FjKI3oLVsVEUZNy+xbjACChOSPyonMSAjxXAtSCQrU05KHkwfw0H68cO 17t0XCqPP5sxQsLo93JOz1vPSKS+k2sNU9vdQGZ8NMe6SqSXEBYsBHpjJmAR0QT+LFnU z82hZ2qXGHzO+WuYJC2CVwY3qSxsrYMm1Quxky27O5JY+IAa0j5CPpX1Ybz1fwxfw/PG 9SgzSqjcUmw795RkJBhESp65ei/1ESyMGr1brcyucu0bGxxMK1h/Ql6jhHz+Vbc8HE/3 PWx6v6BHVPcEE5W2PZV4+tO09YsZEZtEu9WEYgrLsUK2kdqepvYGTS2FsVvhKPYeyieW ejDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J0TKGqOXFDjGZzMnLJlInB44KOxfde+y1qQafKgWPqM=; b=S8+EdHmWOwPznQpw2UZgya2jlyov9p4S3qLnXVn4yAgVDuV51Chh6kfhV3O01GQXAp 8X6sOoUPCYZlDz2VB0UlOSwLhfYExrKu2ce5YMjgUbxqzw65nCcsV9c5BsIOXeA08LGm 2goP1g51FOXKSUAsH0JD8iohmpvDm90DOAWymXj9oeQXI38n6XkYV2Q8eu19GAbVLgwT Qd4d6Evo4mo6e6wjAzJjojheHmN2S6PhivUiDtLOPyljfymX034snKVc58HG1bTnOBJV lD2ilo5gyDPMQXmdut4HziqEka5sVD3Qr4I1W5XV5B7mRt8y4/7I0ttn7zF0YPEkJ8Pf HPEg== X-Gm-Message-State: AOAM532cpiUIJcvgqZaWRcp+CPUZXF400SsDU1DeG4VcfWUIo7gcMp7m jA//AAiJeTugGOFz8hLx0iTVRdOPK1uZcJsL X-Google-Smtp-Source: ABdhPJxgXPARDeHtPNducvcy6MpfFJCcRlfPDVwkcWQ63R5PdsN75/npP1PjJ4U7Gs+iHuIsqEVmwA== X-Received: by 2002:a1c:7301:: with SMTP id d1mr2518954wmb.141.1603882469872; Wed, 28 Oct 2020 03:54:29 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t5sm6950619wrb.21.2020.10.28.03.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:54:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Nikhil Rao , dpdk stable Date: Wed, 28 Oct 2020 10:45:15 +0000 Message-Id: <20201028104606.3504127-156-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eventdev: check allocation in Tx adapter' has been queued to stable release 19.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Reviewed-by: Nikhil Rao --- 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 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@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Nikhil Rao @@ -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);