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

Merge "Fix sufficient verifiers."

Browse Source
This commit is contained in:
Alex Buynytskyy
2023-01-30 21:56:59 +00:00
committed by Android (Google) Code Review
parent b9135c4add a925a8a476
commit 48a7fda811
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -6205,8 +6205,12 @@ public class PackageManagerService implements PackageSender, TestUtilityService
mHandler.post(() -> {
final int id = verificationId >= 0 ? verificationId : -verificationId;
final PackageVerificationState state = mPendingVerification.get(id);
if (state == null || !state.checkRequiredVerifierUid(callingUid)) {
// Only allow calls from required verifiers.
if (state == null) {
return;
}
if (!state.checkRequiredVerifierUid(callingUid)
&& !state.checkSufficientVerifierUid(callingUid)) {
// Only allow calls from verifiers.
return;
}

5
services/core/java/com/android/server/pm/PackageVerificationState.java
View File

@@ -83,6 +83,11 @@ class PackageVerificationState {
mSufficientVerifierUids.put(uid, true);
}
/** Returns true if the uid a sufficient verifier. */
boolean checkSufficientVerifierUid(int uid) {
return mSufficientVerifierUids.get(uid, false);
}
/**
* Should be called when a verification is received from an agent so the state of the package
* verification can be tracked.