tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ns_anonymous test: Make it work for natively bridged environment"

Browse source 
am: b49ac81c8e

Change-Id: I43a2e8ec940431a0fff6c0f02899ef3ecd92893c
This commit is contained in:
dimitry 2017-10-12 17:33:17 +00:00 committed by android-build-merger
commit 1ac327aed7
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/dlext_test.cpp
View file

@ -1635,6 +1635,7 @@ TEST(dlext, ns_anonymous) {
uintptr_t addr_start = 0;
uintptr_t addr_end = 0;
bool has_executable_segment = false;
std::vector<map_record> maps_to_copy;
for (const auto& rec : maps) {
@ -1643,6 +1644,7 @@ TEST(dlext, ns_anonymous) {
addr_start = rec.addr_start;
}
addr_end = rec.addr_end;
has_executable_segment = has_executable_segment || (rec.perms & PROT_EXEC) != 0;
maps_to_copy.push_back(rec);
}
@ -1655,6 +1657,16 @@ TEST(dlext, ns_anonymous) {
ASSERT_TRUE(ns_get_dlopened_string_addr > addr_start);
ASSERT_TRUE(ns_get_dlopened_string_addr < addr_end);
if (!has_executable_segment) {
// For some natively bridged environments this code might be missing
// the executable flag. This is because the guest code is not supposed
// to be executed directly and making it non-executable is more secure.
// If this is the case we assume that the first segment is the one that
// has this flag.
ASSERT_TRUE((maps_to_copy[0].perms & PROT_WRITE) == 0);
maps_to_copy[0].perms |= PROT_EXEC;
}
// copy
uintptr_t reserved_addr = reinterpret_cast<uintptr_t>(mmap(nullptr, addr_end - addr_start,
PROT_NONE, MAP_ANON | MAP_PRIVATE,