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 B897A41D52 for ; Thu, 23 Feb 2023 16:07:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A70DC43237; Thu, 23 Feb 2023 16:07:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0C65743230 for ; Thu, 23 Feb 2023 16:07:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164826; 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=xOjzyMtY96RHR+Mf1eBNnDa1lAtjEombijthL6flQ1o=; b=QDvJx0FD6E5gL9QfLwjkCw4Bj55GBXWE/+9vqT0qLsNm/fLf6XfL7N8TshUck6fylLuA9m y7YmaKglSEBCt7Gmz1Qnbm3komFgXmTRDTG1t7p1UIewkrqJIqL7QQLR4twHcGQCyvKwdV fJSW1durFzR5PSpg0gXWYmhs3yeT0V8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [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-553-pLYE57mqOl2Ngk5GENytaw-1; Thu, 23 Feb 2023 10:07:05 -0500 X-MC-Unique: pLYE57mqOl2Ngk5GENytaw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC150100F85F for ; Thu, 23 Feb 2023 15:07:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D96D2166B29; Thu, 23 Feb 2023 15:07:01 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Subject: patch 'fbarray: fix metadata dump' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:01 +0000 Message-Id: <20230223150631.723699-10-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/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/9a43ba896c3d27adde4b7216cb1e8df7d82f3f19 Thanks. Kevin --- >From 9a43ba896c3d27adde4b7216cb1e8df7d82f3f19 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 3 Jan 2023 11:48:48 +0100 Subject: [PATCH] fbarray: fix metadata dump [ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] If the passed fbarray is invalid, its lock was not taken before releasing. Fixes: c44d09811b40 ("eal: add shared indexed file-backed array") Signed-off-by: David Marchand --- lib/eal/common/eal_common_fbarray.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index 3a28a53247..5903474355 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -1486,5 +1486,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) if (fully_validate(arr->name, arr->elt_sz, arr->len)) { fprintf(f, "Invalid file-backed array\n"); - goto out; + return; } @@ -1500,5 +1500,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) for (i = 0; i < msk->n_masks; i++) fprintf(f, "msk idx %i: 0x%016" PRIx64 "\n", i, msk->data[i]); -out: rte_rwlock_read_unlock(&arr->rwlock); } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.107159005 +0000 +++ 0010-fbarray-fix-metadata-dump.patch 2023-02-23 14:46:23.711235760 +0000 @@ -1 +1 @@ -From 70eb4069b05c82494155a89eb8d08d8d2f57b059 Mon Sep 17 00:00:00 2001 +From 9a43ba896c3d27adde4b7216cb1e8df7d82f3f19 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index f11f87979f..169e66e04b 100644 +index 3a28a53247..5903474355 100644 @@ -21 +22 @@ -@@ -1483,5 +1483,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) +@@ -1486,5 +1486,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) @@ -28 +29 @@ -@@ -1497,5 +1497,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) +@@ -1500,5 +1500,4 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)