Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." (c0aacbe5) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -297,12 +297,6 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
		bool force_mount_namespace) {
		// 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;
		if (mount_mode == MOUNT_EXTERNAL_DEFAULT) {
		storageSource = "/mnt/runtime/default";
		@@ -314,6 +308,13 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
		// Sane default of no storage visible
		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",
		NULL, MS_BIND \| MS_REC \| MS_SLAVE, NULL)) == -1) {
		ALOGW("Failed to mount %s to /storage: %s", storageSource.string(), strerror(errno));