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 D0D2342ECF for ; Thu, 20 Jul 2023 17:22:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCF87427E9; Thu, 20 Jul 2023 17:22:34 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 27F5340685 for ; Thu, 20 Jul 2023 17:22:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866552; 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=nqr0t7vbzwkNy21tsEKqEKJ01lmcrbuwwhLDj/Vk78w=; b=aBc0wV/8FZbQ22uzjK/ARRFcE3QBPR5xWusLeZPaIzFdJWifTZEzIMUCEfdJR0p5aNy1ZC iS4W2QTyMzdYGXT8bz/bEj+w7QRvn91NowEFIzJhIUnV3EczUFXxDVXyZoMCgxKq6vEO1p Q9k4QOXmeYdrNfQOXn40nM+JO9Jrhvs= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-58-yFY74jGUPdG92ACw9aCZ2w-1; Thu, 20 Jul 2023 11:20:47 -0400 X-MC-Unique: yFY74jGUPdG92ACw9aCZ2w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BDAB88D551; Thu, 20 Jul 2023 15:20:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 775D34CD0E3; Thu, 20 Jul 2023 15:19:59 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Konstantin Ananyev , Honnappa Nagarahalli , dpdk stable Subject: patch 'ring: fix use after free' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:15 +0100 Message-ID: <20230720151942.262154-4-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/096ec31efd0f93756bbb4fe4d0876aef162a656c Thanks. Kevin --- >From 096ec31efd0f93756bbb4fe4d0876aef162a656c 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/ring/rte_ring.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index 6a94a038c4..40d29c1bc5 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -342,9 +342,4 @@ rte_ring_free(struct rte_ring *r) } - 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(); @@ -365,4 +360,7 @@ 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.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:55.681995558 +0100 +++ 0004-ring-fix-use-after-free.patch 2023-07-20 16:17:54.415749503 +0100 @@ -1 +1 @@ -From ce4bd6e14aa693c80c5218f7d896c98b3b85b54a Mon Sep 17 00:00:00 2001 +From 096ec31efd0f93756bbb4fe4d0876aef162a656c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce4bd6e14aa693c80c5218f7d896c98b3b85b54a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 8ed455043d..057d25ff6f 100644 +index 6a94a038c4..40d29c1bc5 100644 @@ -24 +25 @@ -@@ -334,9 +334,4 @@ rte_ring_free(struct rte_ring *r) +@@ -342,9 +342,4 @@ rte_ring_free(struct rte_ring *r) @@ -34 +35 @@ -@@ -357,4 +352,7 @@ rte_ring_free(struct rte_ring *r) +@@ -365,4 +360,7 @@ rte_ring_free(struct rte_ring *r)