Revert^2 "Enforce files loaded in DexFile to be read-only" am: e5e7978754 am: ecd16e64e9 am: 9d34ae20b8 am: 1638b3fc59 am: 0de6ed4eab
Original change: https://android-review.googlesource.com/c/platform/art/+/2218806
Change-Id: Ie551d37c6af3bcc68c9e80427d6747c87b121e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index ecb9010..80773e9 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -57,6 +57,9 @@
namespace art {
+// Should be the same as dalvik.system.DexFile.ENFORCE_READ_ONLY_JAVA_DCL
+static constexpr uint64_t kEnforceReadOnlyJavaDcl = 218865702;
+
using android::base::StringPrintf;
static bool ConvertJavaArrayToDexFiles(
@@ -316,6 +319,32 @@
return nullptr;
}
+#ifdef __ANDROID__
+ const int uid = getuid();
+ // The following UIDs are exempted:
+ // * Root (0): root processes always have write access to files.
+ // * System (1000): /data/app/**.apk are owned by AID_SYSTEM;
+ // loading installed APKs in system_server is allowed.
+ // * Shell (2000): directly calling dalvikvm/app_process in ADB shell
+ // to run JARs with CLI is allowed.
+ if (uid != 0 && uid != 1000 && uid != 2000) {
+ Runtime* const runtime = Runtime::Current();
+ CompatFramework& compatFramework = runtime->GetCompatFramework();
+ if (compatFramework.IsChangeEnabled(kEnforceReadOnlyJavaDcl)) {
+ if (access(sourceName.c_str(), W_OK) == 0) {
+ LOG(ERROR) << "Attempt to load writable dex file: " << sourceName.c_str();
+ ScopedLocalRef<jclass> se(env, env->FindClass("java/lang/SecurityException"));
+ std::string message(
+ StringPrintf("Writable dex file '%s' is not allowed.", sourceName.c_str()));
+ env->ThrowNew(se.get(), message.c_str());
+ return nullptr;
+ }
+ }
+ }
+#else
+ (void) kEnforceReadOnlyJavaDcl;
+#endif
+
std::vector<std::string> error_msgs;
const OatFile* oat_file = nullptr;
std::vector<std::unique_ptr<const DexFile>> dex_files =