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

Fix cross user package visibility leakage for PackageManager (3/n)

Browse Source 
APIs:
- PackageManager#getTargetSdkVersion
- PackageManager#checkSignatures
- PackageManager#getAllIntentFilters
- PackageManager#getInstallerPackageName
- PackageManager#getInstallSourceInfo

Fix: 214570143
Fix: 216113658
Fix: 216114190
Fix: 216115262
Test: atest CrossUserPackageVisibilityTests
Change-Id: I7f85899c93ce2d57f82d2ed8b98e2b1d0011cac8
This commit is contained in:
Rhed Jao
2022-04-18 16:54:49 +08:00
parent bad3a9b80b
commit 0861424318
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/pm/ComputerEngine.java
View File

@@ -3766,7 +3766,7 @@ public class ComputerEngine implements Computer {
if (ps == null || ps.getPkg() == null) {
return -1;
}
if (shouldFilterApplication(ps, Binder.getCallingUid(),
if (shouldFilterApplicationIncludingUninstalled(ps, Binder.getCallingUid(),
UserHandle.getCallingUserId())) {
return -1;
}
@@ -4213,8 +4213,8 @@ public class ComputerEngine implements Computer {
}
final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
if (shouldFilterApplication(ps1, callingUid, callingUserId)
|| shouldFilterApplication(ps2, callingUid, callingUserId)) {
if (shouldFilterApplicationIncludingUninstalled(ps1, callingUid, callingUserId)
|| shouldFilterApplicationIncludingUninstalled(ps2, callingUid, callingUserId)) {
return PackageManager.SIGNATURE_UNKNOWN_PACKAGE;
}
return checkSignaturesInternal(p1.getSigningDetails(), p2.getSigningDetails());
@@ -5022,7 +5022,7 @@ public class ComputerEngine implements Computer {
if (pkg == null || ArrayUtils.isEmpty(pkg.getActivities())) {
return ParceledListSlice.emptyList();
}
if (shouldFilterApplication(ps, callingUid, callingUserId)) {
if (shouldFilterApplicationIncludingUninstalled(ps, callingUid, callingUserId)) {
return ParceledListSlice.emptyList();
}
final int count = ArrayUtils.size(pkg.getActivities());
@@ -5057,7 +5057,7 @@ public class ComputerEngine implements Computer {
String installerPackageName = installSource.installerPackageName;
if (installerPackageName != null) {
final PackageStateInternal ps = mSettings.getPackage(installerPackageName);
if (ps == null || shouldFilterApplication(ps, callingUid,
if (ps == null || shouldFilterApplicationIncludingUninstalled(ps, callingUid,
UserHandle.getUserId(callingUid))) {
installerPackageName = null;
}
@@ -5074,8 +5074,8 @@ public class ComputerEngine implements Computer {
return InstallSource.EMPTY;
}
if (ps == null
|| shouldFilterApplication(ps, callingUid, UserHandle.getUserId(callingUid))) {
if (ps == null || shouldFilterApplicationIncludingUninstalled(
ps, callingUid, UserHandle.getUserId(callingUid))) {
return null;
}
@@ -5100,7 +5100,8 @@ public class ComputerEngine implements Computer {
installerPackageName = installSource.installerPackageName;
if (installerPackageName != null) {
final PackageStateInternal ps = mSettings.getPackage(installerPackageName);
if (ps == null || shouldFilterApplication(ps, callingUid, userId)) {
if (ps == null
|| shouldFilterApplicationIncludingUninstalled(ps, callingUid, userId)) {
installerPackageName = null;
}
}
@@ -5125,7 +5126,8 @@ public class ComputerEngine implements Computer {
} else {
initiatingPackageName = installSource.initiatingPackageName;
final PackageStateInternal ps = mSettings.getPackage(initiatingPackageName);
if (ps == null || shouldFilterApplication(ps, callingUid, userId)) {
if (ps == null
|| shouldFilterApplicationIncludingUninstalled(ps, callingUid, userId)) {
initiatingPackageName = null;
}
}
@@ -5134,7 +5136,8 @@ public class ComputerEngine implements Computer {
originatingPackageName = installSource.originatingPackageName;
if (originatingPackageName != null) {
final PackageStateInternal ps = mSettings.getPackage(originatingPackageName);
if (ps == null || shouldFilterApplication(ps, callingUid, userId)) {
if (ps == null
|| shouldFilterApplicationIncludingUninstalled(ps, callingUid, userId)) {
originatingPackageName = null;
}
}