From nobody Wed Sep 23 18:26:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hqlm34yDsz6tRdw for ; Wed, 23 Sep 2026 18:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hqlm33FJrz4r8k for ; Wed, 23 Sep 2026 18:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790187987; 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; bh=81gm0merxJeXlVwmb7zw5czbKbgtWZqPXGRiA/rTtdE=; b=qPgDHKLpOEd+gsOXKGXZxCD1gcCEgYRz4c4/CKEQ0FK6bktzJ55DaPxCLfGqnLqgTF0hyE igsG+5nFODZbVAgxoCYGH0ucbD0SSTUS0Ej7rIyOs1oZmXXj8CFOKPjD1X5hS/k2mdzZVV q/RGK1nf8A1UwEakR5SFmDBPuXzlsk40nOWFcFuvn5YKnWk8uK1WecJ10i3p8TNWoFEtLo pjeAurEjgknE9yyGOeva9ALbnhwKrdz3sVBrtDAfONvXqtnQ8B9m8DjwurRk6Vo0L4NmWM rG6jXEhvOAfuJwgyBHPtmG8ZQL9DXhoq8YZXirJHewSUm5VrU14vRCy9RyZ5Vg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790187987; b=jHpZ5Ns0St5ffEyJkgV1BNrTZ3FHBXe5n62JAEOK8lwy31AoQrlXcQIJ5L25HjKH5ZPDWl rjjkqic/5S/LxQCbDPQeR7FUn38GKdZzMFhN5giadhJGMesVA6/N8tbvJPA/xV2yck03mM Npqf6tVmEgBzOqq0im1dSau3mqkgbd71k8Hzl1zcLXMTgQ4RMRMoolL5XpdcOMeh5bgThw YJnCGaVWvmpG8k7MBVlr7WH4t1Jipwq+4BEyB8WdnlCkDO0Gnz0M/O49iWfrb7a6lf89w9 KuClBfUVMWGJs5seXWZNqPl5XB58du78Du59vDZIq0J5rNygqRuuhPgiDrAZrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790187987; 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; bh=81gm0merxJeXlVwmb7zw5czbKbgtWZqPXGRiA/rTtdE=; b=GUBovUqFQQSHz/TWNNQZmjvVbJJCzKDc6Y2aLqksWV6TW3iIDrDA6Elshh6JecS65w40f7 MV3UB4ub8sZaqMp7DCw8oY6xB+HevliEXues86Q6otVuNu54H2HR/XfqZhzrpo6kROftLw ovmOYhluGAO6yu6L0K2Gc7YkFhG7ir4/we3ov+dq/z26ZoRjuzXLicHAllkgiFyHhfryfu rCkFdgoisnc3y2GlZ+Ygq/DPV2tgOVOlqAevfqfIj8xfZikRrU/wL8Ek4bRQrzm0Ns2Yas 1dEMJV0Ykv0+MZaN5hGMLFJn1yARbvnwrfKbld9oPK0aeotXChKFDnhuPUDEZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hqlm322X5z14jl for ; Wed, 23 Sep 2026 18:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 23 Sep 2026 18:26:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Slava Shwartsman From: Konstantin Belousov Subject: git: ac9c07a3e908 - main - linuxkpi: Fix double-cleanup in linux_pci_attach_device() error path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac9c07a3e90888d69d0a524de520d4de8ae60de5 Auto-Submitted: auto-generated Date: Wed, 23 Sep 2026 18:26:27 +0000 Message-Id: <6ab419d3.20c60.2f13a8f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac9c07a3e90888d69d0a524de520d4de8ae60de5 commit ac9c07a3e90888d69d0a524de520d4de8ae60de5 Author: Slava Shwartsman AuthorDate: 2026-09-22 17:21:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-23 18:23:03 +0000 linuxkpi: Fix double-cleanup in linux_pci_attach_device() error path put_device() already triggers lkpi_pci_dev_release(), which removes pdev from pci_devices, frees pdev->bus, destroys pcie_cap_lock, and uninits the DMA private data. Reported by: gallatin Fixes: 66b25ddf9125 ("LinuxKPI: pci detach: implement a proper detach (release) path") Reviewed by: kib, gallatin, bz Sponsored by: NVidia networking MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D59913 --- sys/compat/linuxkpi/common/src/linux_pci.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 6e6362b943ec..fbfde94ca6fd 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -182,6 +182,8 @@ linux_pdev_dma_uninit(struct pci_dev *pdev) struct linux_dma_priv *priv; priv = pdev->dev.dma_priv; + if (priv == NULL) + return (0); if (priv->dmat) bus_dma_tag_destroy(priv->dmat); if (priv->dmat_coherent) @@ -480,6 +482,7 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) spin_lock_init(&pdev->dev.devres_lock); INIT_LIST_HEAD(&pdev->dev.devres_head); INIT_LIST_HEAD(&pdev->dev.irqents); + INIT_LIST_HEAD(&pdev->links); return (0); } @@ -698,7 +701,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, pdev->irq = pdev->dev.irq; error = linux_pdev_dma_init(pdev); if (error) - goto out_dma_init; + goto out_err; spin_lock(&pci_lock); list_add(&pdev->links, &pci_devices); @@ -713,7 +716,7 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, pbus = lkpinew_pci_dev(parent); if (pbus == NULL) { error = ENXIO; - goto out_dma_init; + goto out_err; } } pcie_find_root_port(pbus); @@ -728,19 +731,11 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, if (pdrv != NULL) { error = pdrv->probe(pdev, id); if (error) - goto out_probe; + goto out_err; } return (0); -/* XXX the cleanup does not match the allocation up there. */ -out_probe: - free(pdev->bus, M_DEVBUF); - spin_lock_destroy(&pdev->pcie_cap_lock); - linux_pdev_dma_uninit(pdev); -out_dma_init: - spin_lock(&pci_lock); - list_del(&pdev->links); - spin_unlock(&pci_lock); +out_err: put_device(&pdev->dev); return (-error); }