Skip to content

Commit

Permalink
fix: check mmap result (#2003)
Browse files Browse the repository at this point in the history
* fix: check mmap result

Check if mmap failed (return value MAP_FAILED) and, if yes, exit.

* feat: fallback to pread() if file mmap failed

* fix: initialize zero buffer for uninitialized mapping
  • Loading branch information
secDre4mer authored Nov 15, 2023
1 parent c1e911f commit 1256631
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions libyara/proc/linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,16 @@ YR_API const uint8_t* yr_process_fetch_memory_block_data(YR_MEMORY_BLOCK* block)
fd,
proc_info->map_offset);
close(fd);
if (context->buffer == MAP_FAILED)
{
// Notify the code below that we couldn't read from the file
// fallback to pread() from the process
fd = -1;
}
context->buffer_size = block->size;
}
else

if (fd < 0)
{
context->buffer = mmap(
NULL,
Expand All @@ -228,17 +236,14 @@ YR_API const uint8_t* yr_process_fetch_memory_block_data(YR_MEMORY_BLOCK* block)
MAP_PRIVATE | MAP_ANONYMOUS,
-1,
0);
}

if (context->buffer != NULL)
{
if (context->buffer == MAP_FAILED)
{
context->buffer = NULL;
context->buffer_size = 0;
goto _exit;
}
context->buffer_size = block->size;
}
else
{
context->buffer_size = 0;
goto _exit;
}

// If mapping can't be accessed through the filesystem, read everything from
// target process VM.
Expand Down

0 comments on commit 1256631

Please sign in to comment.