github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-03-30 22:19:17 +02:00
Code Releases Activity

Fix Memory Search variable shadowing

Browse Source
This commit is contained in:
sjanusz-r7 2024-01-04 16:34:08 +00:00
parent 92d04de09c
commit 4f19a1c4ae
1 changed files with 7 additions and 9 deletions

16
c/meterpreter/source/extensions/stdapi/server/sys/process/memory.c

@ -595,39 +595,37 @@ DWORD request_sys_process_memory_search(Remote* remote, Packet* packet)
{ {
size_t current_buffer_offset = 0; size_t current_buffer_offset = 0;
size_t match_length = 0; size_t match_length = 0;
int result = -1; int match_result = -1;
do do
{ {
const unsigned char* current_buffer_ptr = memory_buffer + current_buffer_offset; const unsigned char* current_buffer_ptr = memory_buffer + current_buffer_offset;
const size_t bytes_to_regex = bytes_read - current_buffer_offset; const size_t bytes_to_regex = bytes_read - current_buffer_offset;
result = re_matchp((re_t)&regex_needles[current_needle_index].compiled_regex, current_buffer_ptr, bytes_to_regex, current_max_match_length, &match_length); match_result = re_matchp((re_t)&regex_needles[current_needle_index].compiled_regex, current_buffer_ptr, bytes_to_regex, current_max_match_length, &match_length);
if (result != -1) if (match_result != -1)
{ {
const size_t match_address = read_address + current_buffer_offset + result; const size_t match_address = read_address + current_buffer_offset + match_result;
dprintf("[MEM SEARCH] -- ! FOUND A REGEX MATCH ! --"); dprintf("[MEM SEARCH] -- ! FOUND A REGEX MATCH ! --");
dprintf("[MEM SEARCH] Address: %p", match_address); dprintf("[MEM SEARCH] Address: %p", match_address);
if (match_length < min_match_length) if (match_length < min_match_length)
{ {
dprintf("[MEM SEARCH] Match length was too short, skipping."); dprintf("[MEM SEARCH] Match length was too short, skipping.");
current_buffer_offset += (result + match_length); current_buffer_offset += (match_result + match_length);
continue; continue;
} }
const unsigned char* memory_buffer_ptr = memory_buffer + current_buffer_offset + result; const unsigned char* memory_buffer_ptr = memory_buffer + current_buffer_offset + match_result;
if (add_needle_results_to_packet(response, memory_buffer_ptr, match_length, match_address, (size_t)mem.BaseAddress, mem.RegionSize) != ERROR_SUCCESS) if (add_needle_results_to_packet(response, memory_buffer_ptr, match_length, match_address, (size_t)mem.BaseAddress, mem.RegionSize) != ERROR_SUCCESS)
{ {
dprintf("[MEM SEARCH] Adding search results to packet was not successful"); dprintf("[MEM SEARCH] Adding search results to packet was not successful");
} }
current_buffer_offset += (result + match_length); current_buffer_offset += (match_result + match_length);
} }
} while (result != -1); } while (result != -1);
} }
memory_region_offset += bytes_to_read; memory_region_offset += bytes_to_read;