Commit 6597ff1d authored by David Carlier's avatar David Carlier Committed by Danilo Krummrich
Browse files

drm/nouveau: fix nvkm_device leak on aperture removal failure 



When aperture_remove_conflicting_pci_devices() fails during probe, the
error path returns directly without unwinding the nvkm_device that was
just allocated by nvkm_device_pci_new(). This leaks both the device
wrapper and the pci_enable_device() reference taken inside it.

Jump to the existing fail_nvkm label so nvkm_device_del() runs and
balances both. The leak was introduced when the intermediate
nvkm_device_del() between detection and aperture removal was dropped
in favor of creating the pci device once.

Fixes: c0bfe343 ("drm/nouveau: create pci device once")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDavid Carlier <devnexen@gmail.com>
Link: https://patch.msgid.link/20260411062938.22925-1-devnexen@gmail.com


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent d33db956

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, 
	/* Remove conflicting drivers (vesafb, efifb etc). */

	ret = aperture_remove_conflicting_pci_devices(pdev, driver_pci.name);

	if (ret)

		return ret;

		goto fail_nvkm;



	pci_set_master(pdev);