mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 18:13:41 +02:00
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: c0bfe34330 ("drm/nouveau: create pci device once")
Cc: stable@vger.kernel.org
Signed-off-by: David Carlier <devnexen@gmail.com>
Link: https://patch.msgid.link/20260411062938.22925-1-devnexen@gmail.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
parent
d33db956c9
commit
6597ff1d8d
|
|
@ -874,7 +874,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
|
||||||
/* Remove conflicting drivers (vesafb, efifb etc). */
|
/* Remove conflicting drivers (vesafb, efifb etc). */
|
||||||
ret = aperture_remove_conflicting_pci_devices(pdev, driver_pci.name);
|
ret = aperture_remove_conflicting_pci_devices(pdev, driver_pci.name);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto fail_nvkm;
|
||||||
|
|
||||||
pci_set_master(pdev);
|
pci_set_master(pdev);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user