Fix buffer overflow in GetRawInputDeviceInfo proxy #4268
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The proxy for GetRawInputDeviceInfo() incorrectly assumes that pcbSize is always in wchars when unicode is used, which is only true if the name of the device is being queried (`uiCommand == RIDI_DEVICENAME`). Otherwise, it is the exact size of the buffer in bytes. Right now, that means that the proxy will write double the number of bytes it's supposed to for the other `uiCommand` values, potentially causing a buffer overflow. Also, when no `pData` value is given, `*pcbSize` is allowed to be uninitialized. The proxy currently reads it unconditionally as a UINT, which would be UB in that case. `memcpy` is able to safely copy uninitialized values, so let's use that instead!
|
Warning -- I haven't done any testing with this patch, so it should not be merged until somebody verifies that it works. |
|
Is the patch still work in progress or does it only missing some testing? |
|
@DavidXanatos It's only missing testing -- I just set it to "draft" so it would not be accidentally merged until someone has verified that it works. |
|
ok great I'll merge and debug it |
|
one issue i see already ULONG status; mist always be the first fiels in a reply structure even if it appears unused |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The proxy for GetRawInputDeviceInfo() incorrectly assumes that pcbSize is always in wchars when unicode is used, which is only true if the name of the device is being queried (
uiCommand == RIDI_DEVICENAME).Otherwise, it is the exact size of the buffer in bytes. Right now, that means that the proxy will write double the number of bytes it's supposed to for the other
uiCommandvalues, potentially causing a buffer overflow.Also, when no
pDatavalue is given,*pcbSizeis allowed to be uninitialized. The proxy currently reads it unconditionally as a UINT, which would be UB in that case.memcpyis able to safely copy uninitialized values, so let's use that instead!Fixes #4267