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 B21DE48A44 for ; Fri, 31 Oct 2025 15:40:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABACF406A2; Fri, 31 Oct 2025 15:40:23 +0100 (CET) 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 6B73640150 for ; Fri, 31 Oct 2025 15:40:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921622; 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=KGokljN3Md2z224hP+LsZ6Cz6vRitKl7984l4A5hL7k=; b=DQCQ9QQFEGAnOhbnl38b95Fwr/rGHXDMg6EryFTwqvceMfJ5SBCzTF3d/eXU31yDCCsdOm o6UbomXYZwep4b7eEBAvuLjXlKuqohRA1essC63M6/BQOykZGHNpnaAAnFx5IEZDjKO4Lp skKHm1UaWpOSjkWNgq00AN2pGTEAmTw= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-580-wLfQrOo6NFOd8759cpDFRg-1; Fri, 31 Oct 2025 10:40:18 -0400 X-MC-Unique: wLfQrOo6NFOd8759cpDFRg-1 X-Mimecast-MFC-AGG-ID: wLfQrOo6NFOd8759cpDFRg_1761921617 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 93BB419560B7; Fri, 31 Oct 2025 14:40:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 226E0180044F; Fri, 31 Oct 2025 14:40:13 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: dpdk stable Subject: patch 'bus/pci: fix resource leak in secondary process' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:34:13 +0000 Message-ID: <20251031143421.324432-131-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: MB6_xexxRkGFfQBDLYOcfg55Dgbn_b4MopM1g_0Lnfo_1761921617 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 24.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 11/05/25. 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/9d8103fda92ef6adf08e8ed6740bed8fde068f5b Thanks. Kevin --- >From 9d8103fda92ef6adf08e8ed6740bed8fde068f5b Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 24 Oct 2025 10:18:24 +0100 Subject: [PATCH] bus/pci: fix resource leak in secondary process [ upstream commit 6ca08d36ba7310edfe96207b299f79221b7e2d37 ] Right after setting up VFIO device, we attempt to fill region information. This operation can fail, and if it does, we do not release the device fd. Fix the control flow to free the device fd if getting region info failed. Fixes: 4b741542ecde ("bus/pci: avoid depending on private kernel value") Signed-off-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 5317170231..eb579d21bf 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -948,5 +948,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) int vfio_dev_fd; struct rte_pci_addr *loc = &dev->addr; - int i, j, ret; + int j, ret, i = 0; struct mapped_pci_resource *vfio_res = NULL; struct mapped_pci_res_list *vfio_res_list = @@ -986,5 +986,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) ret = pci_vfio_fill_regions(dev, vfio_dev_fd, &device_info); if (ret) - return ret; + goto err_vfio_dev_fd; /* map BARs */ -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:56.152183769 +0000 +++ 0131-bus-pci-fix-resource-leak-in-secondary-process.patch 2025-10-31 13:53:52.327524277 +0000 @@ -1 +1 @@ -From 6ca08d36ba7310edfe96207b299f79221b7e2d37 Mon Sep 17 00:00:00 2001 +From 9d8103fda92ef6adf08e8ed6740bed8fde068f5b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6ca08d36ba7310edfe96207b299f79221b7e2d37 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index c63721dd61..8562fdcc6b 100644 +index 5317170231..eb579d21bf 100644 @@ -22 +23 @@ -@@ -933,5 +933,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) +@@ -948,5 +948,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) @@ -29 +30 @@ -@@ -969,5 +969,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) +@@ -986,5 +986,5 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)