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 6C5DBA0093 for ; Thu, 28 May 2020 18:25:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4F2971DC13; Thu, 28 May 2020 18:25:47 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id F3C1F1DC1D for ; Thu, 28 May 2020 18:25:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683145; 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=zoMtxzc6K/Kjp9rbB2fEk7l1833oPTEtdWD2hy7cKLU=; b=fhqFXSNWqTOT29Yt45RKMAe7K0Tznl6L38PDjETSbimbDsDG6vovKT/VIPDk6+c8aED9iM y+gd0aYUcpdZra6wifByu4ZmHKuqsKozxT4RV2UoG/DA9SNHXiwysU0auo9fQb/vFeGWzs WQfj8d3kiqPB5l/8UAZaC5RclMJk+C4= 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-257-RUZHDnhrOSuqrRYW6KG-SQ-1; Thu, 28 May 2020 12:25:40 -0400 X-MC-Unique: RUZHDnhrOSuqrRYW6KG-SQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CE478018A3; Thu, 28 May 2020 16:25:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 870E160C05; Thu, 28 May 2020 16:25:38 +0000 (UTC) From: Kevin Traynor To: Igor Chauskin Cc: Michal Krawczyk , Guy Tzalik , dpdk stable Date: Thu, 28 May 2020 17:22:51 +0100 Message-Id: <20200528162322.7863-64-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: prevent allocation of zero sized memory' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/5ae6a9d1da8a8082fcb30e942deb91b347650313 Thanks. Kevin. --- >From 5ae6a9d1da8a8082fcb30e942deb91b347650313 Mon Sep 17 00:00:00 2001 From: Igor Chauskin Date: Wed, 8 Apr 2020 10:28:54 +0200 Subject: [PATCH] net/ena/base: prevent allocation of zero sized memory [ upstream commit 29dc10d9424ccf26a346387b0a707185e2432400 ] rte_memzone_reserve() will reserve the biggest contiguous memzone available if received 0 as size param. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") Signed-off-by: Igor Chauskin Reviewed-by: Michal Krawczyk Reviewed-by: Guy Tzalik --- drivers/net/ena/base/ena_plat_dpdk.h | 29 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 1d30dbe2c6..5cc559b4f4 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -178,13 +178,16 @@ extern rte_atomic32_t ena_alloc_cnt; #define ENA_MEM_ALLOC_COHERENT(dmadev, size, virt, phys, handle) \ do { \ - const struct rte_memzone *mz; \ - char z_name[RTE_MEMZONE_NAMESIZE]; \ + const struct rte_memzone *mz = NULL; \ ENA_TOUCH(dmadev); ENA_TOUCH(handle); \ - snprintf(z_name, sizeof(z_name), \ + if (size > 0) { \ + char z_name[RTE_MEMZONE_NAMESIZE]; \ + snprintf(z_name, sizeof(z_name), \ "ena_alloc_%d", \ rte_atomic32_add_return(&ena_alloc_cnt, 1)); \ - mz = rte_memzone_reserve(z_name, size, SOCKET_ID_ANY, \ - RTE_MEMZONE_IOVA_CONTIG); \ - handle = mz; \ + mz = rte_memzone_reserve(z_name, size, \ + SOCKET_ID_ANY, \ + RTE_MEMZONE_IOVA_CONTIG); \ + handle = mz; \ + } \ if (mz == NULL) { \ virt = NULL; \ @@ -204,13 +207,15 @@ extern rte_atomic32_t ena_alloc_cnt; dmadev, size, virt, phys, mem_handle, node, dev_node) \ do { \ - const struct rte_memzone *mz; \ - char z_name[RTE_MEMZONE_NAMESIZE]; \ + const struct rte_memzone *mz = NULL; \ ENA_TOUCH(dmadev); ENA_TOUCH(dev_node); \ - snprintf(z_name, sizeof(z_name), \ + if (size > 0) { \ + char z_name[RTE_MEMZONE_NAMESIZE]; \ + snprintf(z_name, sizeof(z_name), \ "ena_alloc_%d", \ - rte_atomic32_add_return(&ena_alloc_cnt, 1)); \ - mz = rte_memzone_reserve(z_name, size, node, \ + rte_atomic32_add_return(&ena_alloc_cnt, 1)); \ + mz = rte_memzone_reserve(z_name, size, node, \ RTE_MEMZONE_IOVA_CONTIG); \ - mem_handle = mz; \ + mem_handle = mz; \ + } \ if (mz == NULL) { \ virt = NULL; \ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.416466637 +0100 +++ 0064-net-ena-base-prevent-allocation-of-zero-sized-memory.patch 2020-05-28 17:12:59.140555518 +0100 @@ -1 +1 @@ -From 29dc10d9424ccf26a346387b0a707185e2432400 Mon Sep 17 00:00:00 2001 +From 5ae6a9d1da8a8082fcb30e942deb91b347650313 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 29dc10d9424ccf26a346387b0a707185e2432400 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 70261bdbc6..4b8fe017dd 100644 +index 1d30dbe2c6..5cc559b4f4 100644 @@ -23 +24 @@ -@@ -185,13 +185,16 @@ extern rte_atomic32_t ena_alloc_cnt; +@@ -178,13 +178,16 @@ extern rte_atomic32_t ena_alloc_cnt; @@ -46 +47 @@ -@@ -211,13 +214,15 @@ extern rte_atomic32_t ena_alloc_cnt; +@@ -204,13 +207,15 @@ extern rte_atomic32_t ena_alloc_cnt;