Railgun datatype updates #14448
Merged
Railgun datatype updates #14448
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
|
Hrm..... |
|
Thanks for testing @bwatters-r7 I was able to reproduce this. I must have made some kinda silly mistake. I'll let you know once I've fixed it. |
|
|
Running with railgun and railgun_reverse_lookups: |
|
I'll wait for Travis to finish and land this then. |
Release NotesFixed a bug where Railgun datatypes were not entirely accurate. |
|
I think this is breaking the file_version (https://github.com/rapid7/metasploit-framework/blob/master/lib/msf/core/post/windows/file_info.rb#L21) function for me on Windows 7 x64. |
5 tasks
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.
This updates a whole bunch of Railgun stuff. The intention is to correct the
PDWORDdata type to always be handled as a pointer to an unsigned 32-bit integer, regardless of the host architecture. This fixes #14400. In doing this, a number of definitions needed to be updated fromPDWORDtoPHANDLEorPSIZE_TwherePDWORDwas being used previously. In these cases, the functions were reliant on Railgun's misinformed interpretation of thePDWORDdatatype. Functions which actually needed a legitPDWORDwere broken on 64-bit systems as they'd be treated incorrectly as having a 64-bit width.Now the
PHANDLEandPSIZE_Tdatatypes are new, and they're both1 actuallyPULONG_PTR(that is to say PHANDLE == PSIZE_T == PULONG_PTR) which is also a new data type. The newPULONG_PTRdata type replaces Railgun's PDWORD and acts as it did when it was broken. You can see in the documentation that it's width is dependant on the host architecture. ThePHANDLEandPSIZE_Ttypes use a new type map which allows us to have a closer mapping to the original function definitions/documentation on MSDN. Eventually, I think we should move towards even more explicit definitions such as definingDWORDasuint32_tfor example. This would help prevent us from having to update the definitions in the future which would ideally only need to be done when they are inconsistent with what Microsoft has published.I also consolidated the Meterpreter packet building code for both the single and multi dispatch routines. This reduces code reuse and will make refactoring easier in the future since there are fewer places that need to be updated to add, remove, and change data types.
Verification
post/test/railgunshould work, all tests should passpost/test/railgun_reverse_lookupsshould also work with all tests passingcheck_dir_permsnow functions correctly1 https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types#size_t