Snap for 8303774 from 32d9f66b9796a4ee82707cec6da4dbaafe0f2991 to tm-release (1b2f3238) · Commits · e / os / platform_frameworks_native

cmds/installd/InstalldNativeService.cpp

+44 −3

Original line number	Diff line number	Diff line
		@@ -787,7 +787,7 @@ binder::Status InstalldNativeService::createSdkSandboxDataPackageDirectory(
		StringPrintf("cacheGid cannot be -1 for sdksandbox data"));
		}
		auto status = createAppDataDirs(sharedPath, sdkSandboxUid, AID_NOBODY,
		&previousSdkSandboxUid, cacheGid, seInfo, 0700);
		&previousSdkSandboxUid, cacheGid, seInfo, 0700 \| S_ISGID);
		if (!status.isOk()) {
		return status;
		}
		@@ -967,7 +967,7 @@ binder::Status InstalldNativeService::reconcileSdkData(
		const int32_t sandboxUid = multiuser_get_sdk_sandbox_uid(userId, appId);
		int32_t previousSandboxUid = multiuser_get_sdk_sandbox_uid(userId, previousAppId);
		auto status = createAppDataDirs(path, sandboxUid, AID_NOBODY, &previousSandboxUid,
		cacheGid, seInfo, 0700);
		cacheGid, seInfo, 0700 \| S_ISGID);
		if (!status.isOk()) {
		res = status;
		continue;
		@@ -2152,6 +2152,13 @@ static void collectQuotaStats(const std::string& uuid, int32_t userId,
		stats->dataSize += space;
		}

		int sdkSandboxUid = multiuser_get_sdk_sandbox_uid(userId, appId);
		if (sdkSandboxUid != -1) {
		if ((space = GetOccupiedSpaceForUid(uuid, sdkSandboxUid)) != -1) {
		stats->dataSize += space;
		}
		}

		int cacheGid = multiuser_get_cache_gid(userId, appId);
		if (cacheGid != -1) {
		if ((space = GetOccupiedSpaceForGid(uuid, cacheGid)) != -1) {
		@@ -2259,8 +2266,17 @@ static void collectManualStats(const std::string& path, struct stats* stats) {
		closedir(d);
		}

		void collectManualStatsForSubDirectories(const std::string& path, struct stats* stats) {
		const auto subDirHandler = [&path, &stats](const std::string& subDir) {
		auto fullpath = path + "/" + subDir;
		collectManualStats(fullpath, stats);
		};
		foreach_subdir(path, subDirHandler);
		}

		static void collectManualStatsForUser(const std::string& path, struct stats* stats,
		bool exclude_apps = false) {
		bool exclude_apps = false,
		bool is_sdk_sandbox_storage = false) {
		DIR *d;
		int dfd;
		struct dirent *de;
		@@ -2285,6 +2301,11 @@ static void collectManualStatsForUser(const std::string& path, struct stats* sta
		continue;
		} else if (exclude_apps && (user_uid >= AID_APP_START && user_uid <= AID_APP_END)) {
		continue;
		} else if (is_sdk_sandbox_storage) {
		// In case of sdk sandbox storage (e.g. /data/misc_ce/0/sdksandbox/<package-name>),
		// collect individual stats of each subdirectory (shared, storage of each sdk etc.)
		collectManualStatsForSubDirectories(StringPrintf("%s/%s", path.c_str(), name),
		stats);
		} else {
		collectManualStats(StringPrintf("%s/%s", path.c_str(), name), stats);
		}
		@@ -2427,6 +2448,19 @@ binder::Status InstalldNativeService::getAppSize(const std::optional<std::string
		collectManualStats(dePath, &stats);
		ATRACE_END();

		// In case of sdk sandbox storage (e.g. /data/misc_ce/0/sdksandbox/<package-name>),
		// collect individual stats of each subdirectory (shared, storage of each sdk etc.)
		if (appId >= AID_APP_START && appId <= AID_APP_END) {
		ATRACE_BEGIN("sdksandbox");
		auto sdkSandboxCePath =
		create_data_misc_sdk_sandbox_package_path(uuid_, true, userId, pkgname);
		collectManualStatsForSubDirectories(sdkSandboxCePath, &stats);
		auto sdkSandboxDePath =
		create_data_misc_sdk_sandbox_package_path(uuid_, false, userId, pkgname);
		collectManualStatsForSubDirectories(sdkSandboxDePath, &stats);
		ATRACE_END();
		}

		if (!uuid) {
		ATRACE_BEGIN("profiles");
		calculate_tree_size(
		@@ -2663,6 +2697,13 @@ binder::Status InstalldNativeService::getUserSize(const std::optional<std::strin
		collectManualStatsForUser(dePath, &stats);
		ATRACE_END();

		ATRACE_BEGIN("sdksandbox");
		auto sdkSandboxCePath = create_data_misc_sdk_sandbox_path(uuid_, true, userId);
		collectManualStatsForUser(sdkSandboxCePath, &stats, false, true);
		auto sdkSandboxDePath = create_data_misc_sdk_sandbox_path(uuid_, false, userId);
		collectManualStatsForUser(sdkSandboxDePath, &stats, false, true);
		ATRACE_END();

		if (!uuid) {
		ATRACE_BEGIN("profile");
		auto userProfilePath = create_primary_cur_profile_dir_path(userId);

cmds/installd/tests/installd_service_test.cpp

+12 −10

Original line number	Diff line number	Diff line
		@@ -1051,7 +1051,8 @@ TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkPackageData) {

		const std::string fooCePath = "misc_ce/0/sdksandbox/com.foo";
		CheckFileAccess(fooCePath, kSystemUid, kSystemUid, S_IFDIR \| 0751);
		CheckFileAccess(fooCePath + "/shared", kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(fooCePath + "/shared", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(fooCePath + "/shared/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(fooCePath + "/shared/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		@@ -1059,7 +1060,8 @@ TEST_F(SdkSandboxDataTest, CreateAppData_CreatesSdkPackageData) {

		const std::string fooDePath = "misc_de/0/sdksandbox/com.foo";
		CheckFileAccess(fooDePath, kSystemUid, kSystemUid, S_IFDIR \| 0751);
		CheckFileAccess(fooDePath + "/shared", kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(fooDePath + "/shared", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(fooDePath + "/shared/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(fooDePath + "/shared/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		@@ -1130,28 +1132,28 @@ TEST_F(SdkSandboxDataTest, ReconcileSdkData) {
		ASSERT_BINDER_SUCCESS(service->reconcileSdkData(args));

		const std::string barCePath = "misc_ce/0/sdksandbox/com.foo/bar@random1";
		CheckFileAccess(barCePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(barCePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(barCePath + "/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(barCePath + "/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);

		const std::string bazCePath = "misc_ce/0/sdksandbox/com.foo/baz@random2";
		CheckFileAccess(bazCePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(bazCePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(bazCePath + "/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(bazCePath + "/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);

		const std::string barDePath = "misc_de/0/sdksandbox/com.foo/bar@random1";
		CheckFileAccess(barDePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(barDePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(barDePath + "/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(barDePath + "/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);

		const std::string bazDePath = "misc_de/0/sdksandbox/com.foo/baz@random2";
		CheckFileAccess(bazDePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| 0700);
		CheckFileAccess(bazDePath, kTestSdkSandboxUid, kNobodyUid, S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess(bazDePath + "/cache", kTestSdkSandboxUid, kTestCacheGid,
		S_IFDIR \| S_ISGID \| 0771);
		CheckFileAccess(bazDePath + "/code_cache", kTestSdkSandboxUid, kTestCacheGid,
		@@ -1194,9 +1196,9 @@ TEST_F(SdkSandboxDataTest, ReconcileSdkData_DirectoryNotCreatedIfAlreadyExistsIg

		// Previous directories from first attempt should exist
		CheckFileAccess("misc_ce/0/sdksandbox/com.foo/bar@random1", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| 0700);
		S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess("misc_ce/0/sdksandbox/com.foo/baz@random2", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| 0700);
		S_IFDIR \| S_ISGID \| 0700);
		// No new directories should be created on second attempt
		ASSERT_FALSE(exists("/data/local/tmp/misc_ce/0/sdksandbox/com.foo/bar@r10"));
		ASSERT_FALSE(exists("/data/local/tmp/misc_de/0/sdksandbox/com.foo/bar@r20"));
		@@ -1217,9 +1219,9 @@ TEST_F(SdkSandboxDataTest, ReconcileSdkData_ExtraCodeDirectoriesAreDeleted) {

		// New directoris should exist
		CheckFileAccess("misc_ce/0/sdksandbox/com.foo/bar.diff@random1", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| 0700);
		S_IFDIR \| S_ISGID \| 0700);
		CheckFileAccess("misc_ce/0/sdksandbox/com.foo/baz@random2", kTestSdkSandboxUid, kNobodyUid,
		S_IFDIR \| 0700);
		S_IFDIR \| S_ISGID \| 0700);
		// Directory for old unreferred sdksandbox package name should be removed
		ASSERT_FALSE(exists("/data/local/tmp/misc_ce/0/sdksandbox/com.foo/bar@random1"));
		}

libs/binder/ParcelableHolder.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,10 @@ status_t ParcelableHolder::writeToParcel(Parcel* p) const {
		}

		status_t ParcelableHolder::readFromParcel(const Parcel* p) {
		this->mStability = static_cast<Stability>(p->readInt32());
		int32_t wireStability;
		if (status_t status = p->readInt32(&wireStability); status != OK) return status;
		if (static_cast<int32_t>(this->mStability) != wireStability) return BAD_VALUE;

		this->mParcelable = nullptr;
		this->mParcelableName = std::nullopt;
		int32_t rawDataSize;

libs/binder/ndk/include_cpp/android/binder_parcelable_utils.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,12 @@ class AParcelableHolder {
		return STATUS_INVALID_OPERATION;
		}

		RETURN_ON_FAILURE(AParcel_readInt32(parcel, &this->mStability));
		parcelable_stability_t wireStability;
		RETURN_ON_FAILURE(AParcel_readInt32(parcel, &wireStability));
		if (this->mStability != wireStability) {
		return STATUS_BAD_VALUE;
		}

		int32_t dataSize;
		binder_status_t status = AParcel_readInt32(parcel, &dataSize);

libs/binder/rust/src/parcel/parcelable_holder.rs

+3 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,9 @@ impl Parcelable for ParcelableHolder {
		}

		fn read_from_parcel(&mut self, parcel: &BorrowedParcel<'_>) -> Result<(), StatusCode> {
		self.stability = parcel.read()?;
		if self.stability != parcel.read()? {
		return Err(StatusCode::BAD_VALUE);
		}

		let data_size: i32 = parcel.read()?;
		if data_size < 0 {