Clean up kAccWritable in the verifier.
kAccVerifier was deprecated, instead memory permissions were used in its
stead.
Move dead code scanning in the verifier to be enabled when the results
will be logged.
Change-Id: Id20e62eefe958bd577b86bd7396a439d7a01c1b3
diff --git a/src/mem_map.cc b/src/mem_map.cc
index c9929cc..409e653 100644
--- a/src/mem_map.cc
+++ b/src/mem_map.cc
@@ -91,7 +91,7 @@
<< ", " << prot << ", " << flags << ", " << fd.get() << ", 0) failed for " << name;
return NULL;
}
- return new MemMap(actual, byte_count, actual, page_aligned_byte_count);
+ return new MemMap(actual, byte_count, actual, page_aligned_byte_count, prot);
}
MemMap* MemMap::MapFileAtAddress(byte* addr, size_t byte_count, int prot, int flags, int fd, off_t start) {
@@ -113,7 +113,7 @@
PLOG(ERROR) << "mmap failed";
return NULL;
}
- return new MemMap(actual + page_offset, byte_count, actual, page_aligned_byte_count);
+ return new MemMap(actual + page_offset, byte_count, actual, page_aligned_byte_count, prot);
}
MemMap::~MemMap() {
@@ -126,8 +126,8 @@
}
}
-MemMap::MemMap(byte* begin, size_t size, void* base_begin, size_t base_size)
- : begin_(begin), size_(size), base_begin_(base_begin), base_size_(base_size) {
+MemMap::MemMap(byte* begin, size_t size, void* base_begin, size_t base_size, int prot)
+ : begin_(begin), size_(size), base_begin_(base_begin), base_size_(base_size), prot_(prot) {
CHECK(begin_ != NULL);
CHECK_NE(size_, 0U);
CHECK(base_begin_ != NULL);
@@ -137,10 +137,12 @@
bool MemMap::Protect(int prot) {
if (base_begin_ == NULL && base_size_ == 0) {
+ prot_ = prot;
return true;
}
if (mprotect(base_begin_, base_size_, prot) == 0) {
+ prot_ = prot;
return true;
}