Skip to content

nvidia-modeset: ignore nested nvRevokeDevice() calls #1395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SammyTourani wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nvidia-modeset: ignore nested nvRevokeDevice() calls #1395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/nvidia-modeset/src/nvkms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5307,6 +5307,8 @@ void nvKmsClose(void *pOpenVoid)
}


static NvBool revokeInProgress = FALSE;

/*
*Frees all references to a device
*/
Expand All @@ -5316,6 +5318,21 @@ void nvRevokeDevice(NVDevEvoPtr pDevEvo)
return;
}

/*
* FreeDeviceReference() can call back into nvRevokeDevice() through
* ReleaseModesetOwnership() -> RestoreConsole() if the core channel
* cannot be reallocated. The nested call would call
* FreeDeviceReference() again for the pOpenDev that is being freed,
* dropping its device reference twice, so the device could be freed
* while other clients still use it. The outer loop frees all remaining
* references, so just return.
*/
if (revokeInProgress) {
return;
}

revokeInProgress = TRUE;

struct NvKmsPerOpen *pOpen;

nvListForEachEntry(pOpen, &perOpenIoctlList, perOpenIoctlListEntry) {
Expand All @@ -5330,6 +5347,8 @@ void nvRevokeDevice(NVDevEvoPtr pDevEvo)
}
FreeDeviceReference(pOpen, pOpenDev);
}

revokeInProgress = FALSE;
}

/*!
Expand Down