Skip to content

win32ss: fix TOCTOU in NtUserEnumDisplayDevices #7

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

Draft
Copilot wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Draft

win32ss: fix TOCTOU in NtUserEnumDisplayDevices #7

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
7 changes: 4 additions & 3 deletions win32ss/user/ntuser/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,13 @@ NtUserEnumDisplayDevices(
/* Check the buffer size */
if (pDisplayDevice->cb)
{
DWORD cbCopy = min(pDisplayDevice->cb, sizeof(dispdev));

/* Probe the output buffer */
pDisplayDevice->cb = min(pDisplayDevice->cb, sizeof(dispdev));
ProbeForWrite(pDisplayDevice, pDisplayDevice->cb, 1);
ProbeForWrite(pDisplayDevice, cbCopy, 1);

/* Copy as much as the given buffer allows */
RtlCopyMemory(pDisplayDevice, &dispdev, pDisplayDevice->cb);
RtlCopyMemory(pDisplayDevice, &dispdev, cbCopy);
}
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
Expand Down