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 2F1F7A0093 for ; Tue, 19 May 2020 15:08:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 25FC51D698; Tue, 19 May 2020 15:08:54 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id E60651D698 for ; Tue, 19 May 2020 15:08:52 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id m185so3483226wme.3 for ; Tue, 19 May 2020 06:08:52 -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=sps+wKqQMpkVNOm275j5iWiiOF3DpzT+WxtD2gZFlaY=; b=txQ1KXyJ2lrSrBb7foXOMHBvahyWmurtoCvLPsMWR04tIUs6qy4/00HO2mIH/631kp S09p55LXnhD2K7DBvVP3Q5LK7j3JHEOSqlJN6dskFu7WaynhuwJCoxuZD1Y8BPGWZTN/ IWhFZUWkserxOFWSWTs75Q3NL/fJPvF6vP5xM9kh+spIq7CIQu2BJWiEmrvy6GIL+nzS +Sal5bi7xqrkQt5pcHWz/KBN9Pp0b1WRQP44KYpa3vMpTclxhoJAlSnctvc2oPlRHsgo aLZPS2iuyf2daimB7qr9kHnvMJoFL5AaIVz08Vd/1YxSIbYpJBlpjNmox66pqXIfOGDj gnKw== 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=sps+wKqQMpkVNOm275j5iWiiOF3DpzT+WxtD2gZFlaY=; b=mXaqrXTuZWXuHMXSSP2sa77K1PL9uhw/QUGrIz1FwmNaiSo4i7V7uhWqjc5s4fceWD d8LoAzhwS0SSKA7lU4/fCWr56bsXwF47E0tt+880OJz5AyTrGDKGsAuNUl75Pm2sQ5w6 6J/aUYWzKkbtDeRISutPQBLu+3eZ0j/UeaNZAQJKpbcgCKc8UmdqD+0pIaHpG+lNXDsN Ue3a4LrE4/dVSW4sHfrcWYMFVLnlHDaJ4QmCwSX7FIG64Dzxbtrtscfzyv6kCYcT08uQ 5GTyxldb2u3R75b9xT1fVoiriy60uz24q7FWwmsR2XhQhR7u8zRks1F7tBS1Navzcsgb nbTA== X-Gm-Message-State: AOAM5333nkmjotprMbJjf/n8r6L/zmcuQYWjk3/i/l0rfI/Aq7fb1/wN t5EDZug0xRXSUx6cAcVDlzA7sF8NPi8Fe3S4 X-Google-Smtp-Source: ABdhPJwxnC1e4lhvvBAqlCsDn4t/NKHNG3QYiEyUPY7xEqVQXNHea8JbOLMzNPcWAWbC8J1tTDuZOg== X-Received: by 2002:a1c:e3d7:: with SMTP id a206mr5121225wmh.141.1589893732625; Tue, 19 May 2020 06:08:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z18sm3652634wmk.46.2020.05.19.06.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Chauskin Cc: Michal Krawczyk , Guy Tzalik , dpdk stable Date: Tue, 19 May 2020 14:03:12 +0100 Message-Id: <20200519130549.112823-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: prevent allocation of zero sized memory' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 c6730185e02a872b689027cb3faede52b48ab4d1 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 db9d1bb36b..dddfe65403 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -182,15 +182,18 @@ 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; \ phys = 0; \ @@ -208,15 +211,17 @@ extern rte_atomic32_t ena_alloc_cnt; #define ENA_MEM_ALLOC_COHERENT_NODE( \ 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; \ phys = 0; \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.835489272 +0100 +++ 0057-net-ena-base-prevent-allocation-of-zero-sized-memory.patch 2020-05-19 14:04:44.204648155 +0100 @@ -1,13 +1,14 @@ -From 29dc10d9424ccf26a346387b0a707185e2432400 Mon Sep 17 00:00:00 2001 +From c6730185e02a872b689027cb3faede52b48ab4d1 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") -Cc: stable@dpdk.org Signed-off-by: Igor Chauskin Reviewed-by: Michal Krawczyk @@ -17,10 +18,10 @@ 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 70261bdbc6..4b8fe017dd 100644 +index db9d1bb36b..dddfe65403 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h -@@ -184,15 +184,18 @@ extern rte_atomic32_t ena_alloc_cnt; +@@ -182,15 +182,18 @@ extern rte_atomic32_t ena_alloc_cnt; #define ENA_MEM_ALLOC_COHERENT(dmadev, size, virt, phys, handle) \ do { \ @@ -45,7 +46,7 @@ if (mz == NULL) { \ virt = NULL; \ phys = 0; \ -@@ -210,15 +213,17 @@ extern rte_atomic32_t ena_alloc_cnt; +@@ -208,15 +211,17 @@ extern rte_atomic32_t ena_alloc_cnt; #define ENA_MEM_ALLOC_COHERENT_NODE( \ dmadev, size, virt, phys, mem_handle, node, dev_node) \ do { \