chromium/src
0
Fork 0
Code Activity

[chrome_elf, third-party block support] pe_image_safe HMODULE ctor.

Browse Source 
Only mark PEImageSafe instance as NTLoader memory mapped via the
new HMODULE constructor.

R=grt@chromium.org
Bug=769590
Test=chrome_elf_unittests.exe, ThirdParty*

Change-Id: I6615a00a04ad667cb4676f21769598aca1f659b5
Reviewed-on: https://chromium-review.googlesource.com/1003143
Commit-Queue: Penny MacNeil <pennymac@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551396}
This commit is contained in:
Penny MacNeil
2018-04-17 18:14:48 +00:00
committed by Commit Bot
parent fe3c1d86d1
commit 4328a3dea6
1 changed files with 9 additions and 2 deletions

11
chrome_elf/pe_image_safe/pe_image_safe.h

@ -10,7 +10,7 @@
#include <windows.h> #include <windows.h>
// https://msdn.microsoft.com/library/windows/desktop/ms684179.aspx // https://msdn.microsoft.com/library/windows/desktop/ms684179.aspx
#define LDR_IS_IMAGEMAPPING(handle) (((ULONG_PTR)(handle)) & (ULONG_PTR)2) #define LDR_IS_DATAFILE(handle) (((ULONG_PTR)(handle)) & (ULONG_PTR)1)
namespace pe_image_safe { namespace pe_image_safe {
@ -40,7 +40,14 @@ class PEImageSafe {
PEImageSafe(void* buffer, DWORD buffer_size) : image_size_(buffer_size) { PEImageSafe(void* buffer, DWORD buffer_size) : image_size_(buffer_size) {
image_ = reinterpret_cast<HMODULE>(buffer); image_ = reinterpret_cast<HMODULE>(buffer);
ldr_image_mapping_ = LDR_IS_IMAGEMAPPING(image_); }
// Some functions can only be used on images that have been memory mapped by
// the NT Loader (e.g. LoadLibrary). This constructor must be used to enable
// that functionality.
PEImageSafe(HMODULE buffer, DWORD buffer_size)
: image_(buffer), image_size_(buffer_size) {
ldr_image_mapping_ = !LDR_IS_DATAFILE(buffer);
} }
// Return a pointer to the PE Dos Header. // Return a pointer to the PE Dos Header.