summaryrefslogtreecommitdiffstats
path: root/runtime/oat_file.h
diff options
context:
space:
mode:
authorAlex Light <allight@google.com>2014-07-02 16:28:08 -0700
committerAndreas Gampe <agampe@google.com>2014-07-22 08:24:14 -0700
commita59dd80f9f48cb750d329d4d4af2d99d72b484d1 (patch)
tree36958b15842205addaf6d2a13e40823eab47c8bc /runtime/oat_file.h
parent84568fdf08f8f476292996ad653b4453d2894d23 (diff)
downloadart-a59dd80f9f48cb750d329d4d4af2d99d72b484d1.tar.gz
art-a59dd80f9f48cb750d329d4d4af2d99d72b484d1.tar.bz2
art-a59dd80f9f48cb750d329d4d4af2d99d72b484d1.zip
Runtime can now be set to require relocation
Add a pair of runtime flags -Xrelocate and -Xnorelocate that can force the runtime to require that all files that are run are relocated, to prevent attacks based on the known art base address. Add support for running patchoat on oat files compiled without an image. Change run-test to have new --prebuild and --relocate flags. Bug: 15358152 Change-Id: I91166c62dd1ab80e5cbcb7883a2cd0d56afca32d
Diffstat (limited to 'runtime/oat_file.h')
-rw-r--r--runtime/oat_file.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/oat_file.h b/runtime/oat_file.h
index 44f4466724..3ec2e84345 100644
--- a/runtime/oat_file.h
+++ b/runtime/oat_file.h
@@ -52,6 +52,8 @@ class OatFile {
// ImageWriter which wants to open a writable version from an existing
// file descriptor for patching.
static OatFile* OpenWritable(File* file, const std::string& location, std::string* error_msg);
+ // Opens an oat file from an already opened File. Maps it PROT_READ, MAP_PRIVATE.
+ static OatFile* OpenReadable(File* file, const std::string& location, std::string* error_msg);
// Open an oat file backed by a std::vector with the given location.
static OatFile* OpenMemory(std::vector<uint8_t>& oat_contents,