Fix more locking issues identified by @GuardedBy. (27154a13) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+32 −67

Original line number	Original line	Diff line number	Diff line
	@@ -270,13 +270,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	@GuardedBy("mLock")		@GuardedBy("mLock")
	private PermissionPolicyInternal mPermissionPolicyInternal;		private PermissionPolicyInternal mPermissionPolicyInternal;

	/**
	* For each foreground/background permission the mapping:
	* Background permission -> foreground permissions
	*/
	@GuardedBy("mLock")
	private ArrayMap<String, List<String>> mBackgroundPermissions;

	/**		/**
	* A permission backup might contain apps that are not installed. In this case we delay the		* A permission backup might contain apps that are not installed. In this case we delay the
	* restoration until the app is installed.		* restoration until the app is installed.
	@@ -295,7 +288,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	@GuardedBy("mLock")		@GuardedBy("mLock")
	private CheckPermissionDelegate mCheckPermissionDelegate;		private CheckPermissionDelegate mCheckPermissionDelegate;

	@GuardedBy("mLock")		@NonNull
	private final OnPermissionChangeListeners mOnPermissionChangeListeners;		private final OnPermissionChangeListeners mOnPermissionChangeListeners;

	@GuardedBy("mLock")		@GuardedBy("mLock")
	@@ -959,6 +952,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return PackageManager.PERMISSION_DENIED;		return PackageManager.PERMISSION_DENIED;
	}		}

			@GuardedBy("mLock")
	private boolean checkSinglePermissionInternalLocked(@NonNull UidPermissionState uidState,		private boolean checkSinglePermissionInternalLocked(@NonNull UidPermissionState uidState,
	@NonNull String permissionName, boolean isInstantApp) {		@NonNull String permissionName, boolean isInstantApp) {
	if (!uidState.isPermissionGranted(permissionName)) {		if (!uidState.isPermissionGranted(permissionName)) {
	@@ -1029,6 +1023,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return PackageManager.PERMISSION_DENIED;		return PackageManager.PERMISSION_DENIED;
	}		}

			@GuardedBy("mLock")
	private boolean checkSingleUidPermissionInternalLocked(int uid,		private boolean checkSingleUidPermissionInternalLocked(int uid,
	@NonNull String permissionName) {		@NonNull String permissionName) {
	ArraySet<String> permissions = mSystemPermissions.get(uid);		ArraySet<String> permissions = mSystemPermissions.get(uid);
	@@ -1094,9 +1089,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS,		Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS,
	"addOnPermissionsChangeListener");		"addOnPermissionsChangeListener");

	synchronized (mLock) {		mOnPermissionChangeListeners.addListener(listener);
	mOnPermissionChangeListeners.addListenerLocked(listener);
	}
	}		}

	@Override		@Override
	@@ -1104,9 +1097,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	if (mPackageManagerInt.getInstantAppPackageName(Binder.getCallingUid()) != null) {		if (mPackageManagerInt.getInstantAppPackageName(Binder.getCallingUid()) != null) {
	throw new SecurityException("Instant applications don't have access to this method");		throw new SecurityException("Instant applications don't have access to this method");
	}		}
	synchronized (mLock) {		mOnPermissionChangeListeners.removeListener(listener);
	mOnPermissionChangeListeners.removeListenerLocked(listener);
	}
	}		}

	@Override		@Override
	@@ -3068,6 +3059,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	*		*
	* @return The updated value of the {@code updatedUserIds} parameter		* @return The updated value of the {@code updatedUserIds} parameter
	*/		*/
			@GuardedBy("mLock")
	private @NonNull int[] revokePermissionsNoLongerImplicitLocked(@NonNull UidPermissionState ps,		private @NonNull int[] revokePermissionsNoLongerImplicitLocked(@NonNull UidPermissionState ps,
	@NonNull AndroidPackage pkg, int userId, @NonNull int[] updatedUserIds) {		@NonNull AndroidPackage pkg, int userId, @NonNull int[] updatedUserIds) {
	String pkgName = pkg.getPackageName();		String pkgName = pkg.getPackageName();
	@@ -3120,6 +3112,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	* @param ps The permission state of the package		* @param ps The permission state of the package
	* @param pkg The package requesting the permissions		* @param pkg The package requesting the permissions
	*/		*/
			@GuardedBy("mLock")
	private void inheritPermissionStateToNewImplicitPermissionLocked(		private void inheritPermissionStateToNewImplicitPermissionLocked(
	@NonNull ArraySet<String> sourcePerms, @NonNull String newPerm,		@NonNull ArraySet<String> sourcePerms, @NonNull String newPerm,
	@NonNull UidPermissionState ps, @NonNull AndroidPackage pkg) {		@NonNull UidPermissionState ps, @NonNull AndroidPackage pkg) {
	@@ -3191,6 +3184,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	*		*
	* @return List of users for which the permission state has been changed		* @return List of users for which the permission state has been changed
	*/		*/
			@GuardedBy("mLock")
	private @NonNull int[] setInitialGrantForNewImplicitPermissionsLocked(		private @NonNull int[] setInitialGrantForNewImplicitPermissionsLocked(
	@NonNull UidPermissionState origPs, @NonNull UidPermissionState ps,		@NonNull UidPermissionState origPs, @NonNull UidPermissionState ps,
	@NonNull AndroidPackage pkg, @NonNull ArraySet<String> newImplicitPermissions,		@NonNull AndroidPackage pkg, @NonNull ArraySet<String> newImplicitPermissions,
	@@ -3582,6 +3576,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	+ packageName + " (" + pkg.getPath()		+ packageName + " (" + pkg.getPath()
	+ ") not in privapp-permissions whitelist");		+ ") not in privapp-permissions whitelist");
	if (RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {		if (RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {
			synchronized (mLock) {
	if (mPrivappPermissionsViolations == null) {		if (mPrivappPermissionsViolations == null) {
	mPrivappPermissionsViolations = new ArraySet<>();		mPrivappPermissionsViolations = new ArraySet<>();
	}		}
	@@ -3590,6 +3585,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}
	}		}
	}		}
			}
	return !RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE;		return !RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE;
	}		}

	@@ -3952,6 +3948,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return affectedUserId;		return affectedUserId;
	}		}

			@GuardedBy("mLock")
	private boolean revokeUnusedSharedUserPermissionsLocked(		private boolean revokeUnusedSharedUserPermissionsLocked(
	List<AndroidPackage> pkgList, UidPermissionState uidState) {		List<AndroidPackage> pkgList, UidPermissionState uidState) {
	// Collect all used permissions in the UID		// Collect all used permissions in the UID
	@@ -4043,35 +4040,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}
	}		}

	/**
	* Cache background->foreground permission mapping.
	*
	* <p>This is only run once.
	*/
	private void cacheBackgroundToForegoundPermissionMapping() {
	synchronized (mLock) {
	if (mBackgroundPermissions == null) {
	// Cache background -> foreground permission mapping.
	// Only system declares background permissions, hence mapping does never change.
	mBackgroundPermissions = new ArrayMap<>();
	for (Permission bp : mRegistry.getPermissions()) {
	if (bp.getBackgroundPermission() != null) {
	String fgPerm = bp.getName();
	String bgPerm = bp.getBackgroundPermission();

	List<String> fgPerms = mBackgroundPermissions.get(bgPerm);
	if (fgPerms == null) {
	fgPerms = new ArrayList<>();
	mBackgroundPermissions.put(bgPerm, fgPerms);
	}

	fgPerms.add(fgPerm);
	}
	}
	}
	}
	}

	/**		/**
	* Update all packages on the volume, <u>beside</u> the changing package. If the changing		* Update all packages on the volume, <u>beside</u> the changing package. If the changing
	* package is set too, all packages are updated.		* package is set too, all packages are updated.
	@@ -4145,8 +4113,6 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	flags \|= UPDATE_PERMISSIONS_ALL;		flags \|= UPDATE_PERMISSIONS_ALL;
	}		}

	cacheBackgroundToForegoundPermissionMapping();

	Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "restorePermissionState");		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "restorePermissionState");
	// Now update the permissions for all packages.		// Now update the permissions for all packages.
	if ((flags & UPDATE_PERMISSIONS_ALL) != 0) {		if ((flags & UPDATE_PERMISSIONS_ALL) != 0) {
	@@ -4252,7 +4218,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}
	});		});
	}		}
			synchronized (mLock) {
	mRegistry.removePermission(bp.getName());		mRegistry.removePermission(bp.getName());
			}
	continue;		continue;
	}		}
	final AndroidPackage sourcePkg =		final AndroidPackage sourcePkg =
	@@ -4551,6 +4519,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return builder.toString();		return builder.toString();
	}		}

			@GuardedBy("mLock")
	private int calculateCurrentPermissionFootprintLocked(@NonNull Permission permissionTree) {		private int calculateCurrentPermissionFootprintLocked(@NonNull Permission permissionTree) {
	int size = 0;		int size = 0;
	for (final Permission permission : mRegistry.getPermissions()) {		for (final Permission permission : mRegistry.getPermissions()) {
	@@ -4559,6 +4528,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	return size;		return size;
	}		}

			@GuardedBy("mLock")
	private void enforcePermissionCapLocked(PermissionInfo info, Permission tree) {		private void enforcePermissionCapLocked(PermissionInfo info, Permission tree) {
	// We calculate the max size of permissions defined by this uid and throw		// We calculate the max size of permissions defined by this uid and throw
	// if that plus the size of 'info' would exceed our stated maximum.		// if that plus the size of 'info' would exceed our stated maximum.
	@@ -4572,10 +4542,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {

	private void systemReady() {		private void systemReady() {
	mSystemReady = true;		mSystemReady = true;

			synchronized (mLock) {
	if (mPrivappPermissionsViolations != null) {		if (mPrivappPermissionsViolations != null) {
	throw new IllegalStateException("Signature\|privileged permissions not in "		throw new IllegalStateException("Signature\|privileged permissions not in "
	+ "privapp-permissions whitelist: " + mPrivappPermissionsViolations);		+ "privapp-permissions whitelist: " + mPrivappPermissionsViolations);
	}		}
			}

	mPermissionControllerManager = mContext.getSystemService(PermissionControllerManager.class);		mPermissionControllerManager = mContext.getSystemService(PermissionControllerManager.class);
	mPermissionPolicyInternal = LocalServices.getService(PermissionPolicyInternal.class);		mPermissionPolicyInternal = LocalServices.getService(PermissionPolicyInternal.class);
	@@ -4642,29 +4615,21 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	mMetricsLogger.write(log);		mMetricsLogger.write(log);
	}		}

	/**		@GuardedBy("mLock")
	* Get the mapping of background permissions to their foreground permissions.
	*
	* <p>Only initialized in the system server.
	*
	* @return the map <bg permission -> list<fg perm>>
	*/
	public @Nullable ArrayMap<String, List<String>> getBackgroundPermissions() {
	return mBackgroundPermissions;
	}

	@Nullable		@Nullable
	private UidPermissionState getUidStateLocked(@NonNull PackageSetting ps,		private UidPermissionState getUidStateLocked(@NonNull PackageSetting ps,
	@UserIdInt int userId) {		@UserIdInt int userId) {
	return getUidStateLocked(ps.getAppId(), userId);		return getUidStateLocked(ps.getAppId(), userId);
	}		}

			@GuardedBy("mLock")
	@Nullable		@Nullable
	private UidPermissionState getUidStateLocked(@NonNull AndroidPackage pkg,		private UidPermissionState getUidStateLocked(@NonNull AndroidPackage pkg,
	@UserIdInt int userId) {		@UserIdInt int userId) {
	return getUidStateLocked(pkg.getUid(), userId);		return getUidStateLocked(pkg.getUid(), userId);
	}		}

			@GuardedBy("mLock")
	@Nullable		@Nullable
	private UidPermissionState getUidStateLocked(@AppIdInt int appId, @UserIdInt int userId) {		private UidPermissionState getUidStateLocked(@AppIdInt int appId, @UserIdInt int userId) {
	final UserPermissionState userState = mState.getUserState(userId);		final UserPermissionState userState = mState.getUserState(userId);
	@@ -4707,6 +4672,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	});		});
	}		}

			@GuardedBy("mLock")
	private void readLegacyPermissionStatesLocked(@NonNull UidPermissionState uidState,		private void readLegacyPermissionStatesLocked(@NonNull UidPermissionState uidState,
	@NonNull Collection<LegacyPermissionState.PermissionState> permissionStates) {		@NonNull Collection<LegacyPermissionState.PermissionState> permissionStates) {
	for (final LegacyPermissionState.PermissionState permissionState : permissionStates) {		for (final LegacyPermissionState.PermissionState permissionState : permissionStates) {
	@@ -5371,12 +5337,11 @@ public class PermissionManagerService extends IPermissionManager.Stub {
	}		}
	}		}

	public void addListenerLocked(IOnPermissionsChangeListener listener) {		public void addListener(IOnPermissionsChangeListener listener) {
	mPermissionListeners.register(listener);		mPermissionListeners.register(listener);

	}		}

	public void removeListenerLocked(IOnPermissionsChangeListener listener) {		public void removeListener(IOnPermissionsChangeListener listener) {
	mPermissionListeners.unregister(listener);		mPermissionListeners.unregister(listener);
	}		}