Commit bd986761 authored by kylechar's avatar kylechar Committed by Commit Bot

Revert "Reland "Only pass executable sections to OnDllLoaded for patching""

This reverts commit afc72427.

Reason for revert: Speculative revert for Windows GPU process failing
to start in debug. See https://crbug.com/1145558.

Original change's description:
> Reland "Only pass executable sections to OnDllLoaded for patching"
>
> This is a reland of df9e203b
>
> Original change's description:
> > Only pass executable sections to OnDllLoaded for patching
> >
> > On recent Windows insider builds GetModuleHandleExW loads sections for
> > inspection as non-executable images, rather than as files. This leads
> > to our hooks detecting the SEC_IMAGE attribute and potentially patching
> > functions (e.g. for user32.dll).
> >
> > This caused content_browsertests to fail as it pinned user32.dll in some
> > processes. With this change, the tests run again.
> >
> > See crbug.com/1143397 for a full discussion.
> >
> > Bug: 1143397
> > Change-Id: I3b75464d0442160a417e4cb7084306841aaf76f7
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511531
> > Reviewed-by: Will Harris <wfh@chromium.org>
> > Commit-Queue: Alex Gough <ajgo@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#823354}
>
> Bug: 1143397
> Change-Id: Ibacc1ba6105665c32ea445a7f63178163585efbc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515783
> Auto-Submit: Alex Gough <ajgo@chromium.org>
> Commit-Queue: Alex Gough <ajgo@chromium.org>
> Commit-Queue: Will Harris <wfh@chromium.org>
> Reviewed-by: Will Harris <wfh@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823679}

TBR=wfh@chromium.org,ajgo@chromium.org

Change-Id: I8d37d7dae54327ea84d9d2d327bb183a18c5337a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1143397, 1145558
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518917Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823988}
parent 83d5cd42
...@@ -404,20 +404,6 @@ bool IsValidImageSection(HANDLE section, ...@@ -404,20 +404,6 @@ bool IsValidImageSection(HANDLE section,
if (!(basic_info.Attributes & SEC_IMAGE)) if (!(basic_info.Attributes & SEC_IMAGE))
return false; return false;
// Windows 10 2009+ may open PEs as SEC_IMAGE_NO_EXECUTE in non-dll-loading
// paths which looks identical to dll-loading unless we check if the section
// handle has execute rights.
OBJECT_BASIC_INFORMATION obj_info;
ULONG obj_size_returned;
ret = g_nt.QueryObject(section, ObjectBasicInformation, &obj_info,
sizeof(obj_info), &obj_size_returned);
if (!NT_SUCCESS(ret) || sizeof(obj_info) != obj_size_returned)
return false;
if (!(obj_info.GrantedAccess & SECTION_MAP_EXECUTE))
return false;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment