Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."

Browse Source 
am: c0aacbe513

Change-Id: I7199d687e2e67dd4672bcb388053c33db6b693f5
This commit is contained in:
Robert Sesek
2016-11-11 00:13:57 +00:00
committed by android-build-merger
parent 5451f8279e c0aacbe513
commit ae06fba67a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -300,12 +300,6 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
bool force_mount_namespace) { bool force_mount_namespace) {
// See storage config details at http://source.android.com/tech/storage/ // See storage config details at http://source.android.com/tech/storage/
// Create a second private mount namespace for our process
if (unshare(CLONE_NEWNS) == -1) {
ALOGW("Failed to unshare(): %s", strerror(errno));
return false;
}
String8 storageSource; String8 storageSource;
if (mount_mode == MOUNT_EXTERNAL_DEFAULT) { if (mount_mode == MOUNT_EXTERNAL_DEFAULT) {
storageSource = "/mnt/runtime/default"; storageSource = "/mnt/runtime/default";
@@ -317,6 +311,13 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
// Sane default of no storage visible // Sane default of no storage visible
return true; return true;
} }
// Create a second private mount namespace for our process
if (unshare(CLONE_NEWNS) == -1) {
ALOGW("Failed to unshare(): %s", strerror(errno));
return false;
}
if (TEMP_FAILURE_RETRY(mount(storageSource.string(), "/storage", if (TEMP_FAILURE_RETRY(mount(storageSource.string(), "/storage",
NULL, MS_BIND | MS_REC | MS_SLAVE, NULL)) == -1) { NULL, MS_BIND | MS_REC | MS_SLAVE, NULL)) == -1) {
ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno)); ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno));