Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions.
This is to stop spoofed packageName to pretend to be allowListed packageName so it can bypass the BG-FGS restriction. This applies to both BG-FGS while-in-use restriction and BG-FGS-start restriction since these two restrictions are related. Bug: 216695100 Bug: 215003903 Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName Change-Id: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
This commit is contained in:
@@ -5992,10 +5992,16 @@ public final class ActiveServices {
|
||||
}
|
||||
|
||||
if (ret == REASON_DENIED) {
|
||||
final boolean isAllowedPackage =
|
||||
mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
|
||||
if (isAllowedPackage) {
|
||||
ret = REASON_ALLOWLISTED_PACKAGE;
|
||||
if (verifyPackage(callingPackage, callingUid)) {
|
||||
final boolean isAllowedPackage =
|
||||
mAllowListWhileInUsePermissionInFgs.contains(callingPackage);
|
||||
if (isAllowedPackage) {
|
||||
ret = REASON_ALLOWLISTED_PACKAGE;
|
||||
}
|
||||
} else {
|
||||
EventLog.writeEvent(0x534e4554, "215003903", callingUid,
|
||||
"callingPackage:" + callingPackage + " does not belong to callingUid:"
|
||||
+ callingUid);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6378,4 +6384,21 @@ public final class ActiveServices {
|
||||
/* allowBackgroundActivityStarts */ false)
|
||||
!= REASON_DENIED;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a given packageName belongs to a given uid.
|
||||
* @param packageName the package of the caller
|
||||
* @param uid the uid of the caller
|
||||
* @return true or false
|
||||
*/
|
||||
private boolean verifyPackage(String packageName, int uid) {
|
||||
if (uid == ROOT_UID || uid == SYSTEM_UID) {
|
||||
//System and Root are always allowed
|
||||
return true;
|
||||
}
|
||||
final int userId = UserHandle.getUserId(uid);
|
||||
final int packageUid = mAm.getPackageManagerInternal()
|
||||
.getPackageUid(packageName, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userId);
|
||||
return UserHandle.isSameApp(uid, packageUid);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user