From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5F6C24A078; Tue, 21 Jul 2026 20:15:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664951; cv=none; b=WCjpuUuskxwkd9OH7NHHl7RHdyyktLcV+jcnVGjUfmHtLG9PmqRjG6QXSX3hHEUHsom5S/0WOb6y67xNH2yj1XGF/899MD7capYj235O5beSnWkKLxST/HEHXUvBA3vPPQRLJchpQxAmVzZWlRlntRyxXXiMkc0WGdXgp1cbWRE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664951; c=relaxed/simple; bh=6MmLpPY9nVJ9KzeFE4Hqbv3lUglT3zsqEy8rrjIgTag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NFstQJMEOEylLqnJOVh2Nz/LSoby+MHgHKVeAQL5zjty1hWlRxF4xQ7F7q+tFhp4yh6/4SWKmtGuCdG6HrN5/cb9N96ON2CBoUBljRVn7TuOV9U2zfxvrl/WBjR3gIfavCMuA61Uo/4AMMnZF9VSxAvtDwr696y+oZObV6MNKtM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fXaFGtT0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fXaFGtT0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5188A1F000E9; Tue, 21 Jul 2026 20:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784664949; bh=v3DyfKbXWJ+SkuaOGkwLn1LG3/h5uCfGG/QXuNEkD0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fXaFGtT0sOYqxNfHZvwa2hiG6UWHPSdXwTBcff04Yt2eL8b9sgRb3quxrid9mFDHY MCU6JWmZjky8po9BDt3Cq9mRx/RUrQpqHR7JhKehHYzlzSZ+wxmwQaiy75MEWJF3KB PaBfR7r7QfUfXgTbZSO5UIL05GQ+mhf65tfHb1Gs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Williamson , Kevin Tian , Alex Williamson Subject: [PATCH 6.6 0119/1266] vfio/pci: Release the VGA arbiter client on register_device() failure Date: Tue, 21 Jul 2026 17:09:16 +0200 Message-ID: <20260721152444.464517552@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Williamson commit daedde7f024ecf88bc8e832ed40cf2c795f0796a upstream. The re-order in the Fixes commit below displaced vfio_pci_vga_init() as the last failure point of what is now vfio_pci_core_register_device() without introducing an unwind for the VGA arbiter registration. In current kernels this is mostly benign because vfio_pci_set_decode() only uses pci_dev state, but the original failure path could leave a callback with a freed vdev cookie. The stale registration also becomes unsafe again once the callback follows drvdata to the vfio device. Add the required VGA unwind callout. Fixes: 4aeec3984ddc ("vfio/pci: Re-order vfio_pci_probe()") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Alex Williamson Reviewed-by: Kevin Tian Link: https://lore.kernel.org/r/20260615191241.688297-3-alex.williamson@nvidia.com Signed-off-by: Alex Williamson Signed-off-by: Greg Kroah-Hartman --- drivers/vfio/pci/vfio_pci_core.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -2164,6 +2164,7 @@ out_power: pm_runtime_get_noresume(dev); pm_runtime_forbid(dev); + vfio_pci_vga_uninit(vdev); out_vf: vfio_pci_vf_uninit(vdev); return ret;