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 E323342CBC for ; Thu, 15 Jun 2023 03:33:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE09E40E0F; Thu, 15 Jun 2023 03:33:07 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 33AB240DDA for ; Thu, 15 Jun 2023 03:33:06 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3f8d65ecdb8so13852815e9.0 for ; Wed, 14 Jun 2023 18:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792786; x=1689384786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PtfCEO8Dv+cdG5CYlcHawIjbFeqaMhzSSWxZ53Zyl6w=; b=OY2UAgU9vsJprqlBobuWxckXzkAWpjoro0RWZsAxFuzAkIJ1klMTUOl4HzPpL3tTKA NKolGlD6PGfVm2l+8/UGKZNfEtlzOz3kqhuNIGMF2VtXB9tSjRMJdiMkvJh8pEftTB3v USXFXSxvpyiBgyADbWLaF3lF442tR6J7yHZ8HMOltu1+W7DMwnpXPqJ5cqBFFaHfLrAo Tj+Z1TLkh+SMRIuVXcoEhVuWF36y+HtNlylLjI6fOGymlal2PsH27/asF2qNrJrKB+pC 4XEBWE6UnTn2wmrqwZcEFbCyeqIf7xtNlM1AaZAixZDJr/KS6wdS012xxXatgZFWf2aD kdJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792786; x=1689384786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PtfCEO8Dv+cdG5CYlcHawIjbFeqaMhzSSWxZ53Zyl6w=; b=ZQK+ynsRRlPvR7giGOqmU1XSw+GMUzaFKLv4VMJVJU/zxneFevhL0ADaxJlScOJmsm Z0pAeyT/cZjReSfENtozWsonRWobNHbKLkcSMuvuOVdc4c5PWWxfVuOIPO83LzidZKgL 0Ct+x7mNQCXSI13CUhZAD0VP5nEj6W5bfAOCSU6I5vxdLG2vxfj1Cge+sMiNeD5z6ZdF eE5wSABaiOP7CDdHWlrFojajzqyUp8obB1TmFbbgwG1OAjP8vKboucEETMeRmXCKdqVZ CNCPM0cObJQmmwSjaYo1sP7DRVYm6j9RJy766PhHgPMlaHnckGSUjd6d90JE+c6HAady WnCQ== X-Gm-Message-State: AC+VfDzWfiblpC+N63AdvzSP8DovVfdbtD6gUeSE2iYRNHQBITTqQg+o PiYBsxpQegngh//2Zd6DxfM= X-Google-Smtp-Source: ACHHUZ7niHizUmvzLLP56VR0jcelSp99vueO3QF2WNqFpmro5J9v3Fy0AlErARBEFnl6uo38kpY4IA== X-Received: by 2002:a05:600c:287:b0:3f6:f2b2:15c9 with SMTP id 7-20020a05600c028700b003f6f2b215c9mr15285416wmk.37.1686792785465; Wed, 14 Jun 2023 18:33:05 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id b14-20020adfe30e000000b00307a86a4bcesm19615924wrj.35.2023.06.14.18.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:33:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Konstantin Ananyev , Honnappa Nagarahalli , dpdk stable Subject: patch 'ring: fix use after free' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:31:59 +0100 Message-Id: <20230615013258.1439718-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.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/17/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5491fc6870c551854d6ef31ad1bb3b16d32a2ec6 Thanks. Luca Boccassi --- >From 5491fc6870c551854d6ef31ad1bb3b16d32a2ec6 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 5 May 2023 14:48:34 +0800 Subject: [PATCH] ring: fix use after free [ upstream commit ce4bd6e14aa693c80c5218f7d896c98b3b85b54a ] After the memzone is freed, it is not removed from the 'rte_ring_tailq'. If rte_ring_lookup is called at this time, it will cause a use-after-free problem. This change prevents that from happening. Fixes: 4e32101f9b01 ("ring: support freeing") Signed-off-by: Yunjian Wang Acked-by: Konstantin Ananyev Reviewed-by: Honnappa Nagarahalli --- lib/librte_ring/rte_ring.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c index 6a94a038c4..40d29c1bc5 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c @@ -341,11 +341,6 @@ rte_ring_free(struct rte_ring *r) return; } - if (rte_memzone_free(r->memzone) != 0) { - RTE_LOG(ERR, RING, "Cannot free memory\n"); - return; - } - ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list); rte_mcfg_tailq_write_lock(); @@ -364,6 +359,9 @@ rte_ring_free(struct rte_ring *r) rte_mcfg_tailq_write_unlock(); + if (rte_memzone_free(r->memzone) != 0) + RTE_LOG(ERR, RING, "Cannot free memory\n"); + rte_free(te); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:34.954278477 +0100 +++ 0004-ring-fix-use-after-free.patch 2023-06-15 01:56:34.487539555 +0100 @@ -1 +1 @@ -From ce4bd6e14aa693c80c5218f7d896c98b3b85b54a Mon Sep 17 00:00:00 2001 +From 5491fc6870c551854d6ef31ad1bb3b16d32a2ec6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce4bd6e14aa693c80c5218f7d896c98b3b85b54a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/ring/rte_ring.c | 8 +++----- + lib/librte_ring/rte_ring.c | 8 +++----- @@ -20,5 +21,5 @@ -diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c -index 8ed455043d..057d25ff6f 100644 ---- a/lib/ring/rte_ring.c -+++ b/lib/ring/rte_ring.c -@@ -333,11 +333,6 @@ rte_ring_free(struct rte_ring *r) +diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c +index 6a94a038c4..40d29c1bc5 100644 +--- a/lib/librte_ring/rte_ring.c ++++ b/lib/librte_ring/rte_ring.c +@@ -341,11 +341,6 @@ rte_ring_free(struct rte_ring *r) @@ -36 +37 @@ -@@ -356,6 +351,9 @@ rte_ring_free(struct rte_ring *r) +@@ -364,6 +359,9 @@ rte_ring_free(struct rte_ring *r)