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

Ensure storage permission revoke happens for all users

Browse Source 
When revoking storage permissions due to storage escalation, ensure the
revoke happens for all users

Fixes: 186034260
Bug: 171430330
Test: atest --user-type secondary_user StorageEscalationTest
Merged-In: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
Change-Id: Ieb8bb9cde1576e9eee131338d393b8a3528341ec
This commit is contained in:
Nate Myren
2021-04-29 11:10:12 -07:00
parent 08db350c8b
commit 387182eb49
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -618,23 +618,30 @@ public class PermissionManagerService {
} }
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getUserId(newPackage.applicationInfo.uid);
int numRequestedPermissions = newPackage.requestedPermissions.size(); for (int userId: mUserManagerInt.getUserIds()) {
for (int i = 0; i < numRequestedPermissions; i++) { int numRequestedPermissions = newPackage.requestedPermissions.size();
PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i), for (int i = 0; i < numRequestedPermissions; i++) {
newPackage.packageName, 0, callingUid); PermissionInfo permInfo = getPermissionInfo(newPackage.requestedPermissions.get(i),
if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) { newPackage.packageName, 0, callingUid);
continue; if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {
continue;
}
EventLog.writeEvent(0x534e4554, "171430330", newPackage.applicationInfo.uid,
"Revoking permission " + permInfo.name + " from package "
+ newPackage.packageName + " as either the sdk downgraded "
+ downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy);
try {
revokeRuntimePermission(permInfo.name, newPackage.packageName,
false, userId, permissionCallback);
} catch (IllegalStateException | SecurityException e) {
Log.e(TAG, "unable to revoke " + permInfo.name + " for "
+ newPackage.packageName + " user " + userId, e);
}
} }
EventLog.writeEvent(0x534e4554, "171430330", newPackage.applicationInfo.uid,
"Revoking permission " + permInfo.name + " from package "
+ newPackage.packageName + " as either the sdk downgraded "
+ downgradedSdk + " or newly requested legacy full storage "
+ newlyRequestsLegacy);
revokeRuntimePermission(permInfo.name, newPackage.packageName,
false, userId, permissionCallback);
} }
} }