Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6229df2b authored by Mitch Phillips's avatar Mitch Phillips
Browse files

[GWP-ASan] Scan GWP-ASan regions for native allocations. 

GWP-ASan is part of the native allocator, and may allocate some memory.
When GWP-ASan is enabled, JNI needs to look inside of
GWP-ASan regions as well for native allocations.

Bug: 135634846
Test: ???
Change-Id: Id4f15544a902a034687690214c9481ab963929fc
parent 5ff37df1

core/jni/android_os_Debug.cpp

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[anon:scudo:")) {

            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[anon:GWP-ASan")) {

            which_heap = HEAP_NATIVE;

        } else if (base::StartsWith(name, "[stack")) {

            which_heap = HEAP_STACK;

        } else if (base::StartsWith(name, "[anon:stack_and_tls:")) {