diff options
| author | 2022-02-10 14:58:23 +0100 | |
|---|---|---|
| committer | 2022-02-10 14:58:23 +0100 | |
| commit | fcd877162f229c091a4e178fbb493024a7f960cd (patch) | |
| tree | 230e03bb83d48bed08aeacbe8273e14e3b6858e7 /apex/blobstore | |
| parent | 41466ea4898678e1cd34ecbaf1b81d7915047e36 (diff) | |
Deny supplemental processes access to blob store.
They have no need for it.
Bug: 217538016
Test: atest --test-mapping apex/blobstore
Change-Id: I195333480d5b221ef349b9e5b5606c42e6df8db4
Diffstat (limited to 'apex/blobstore')
| -rw-r--r-- | apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java index 96114dcb66a7..ffa534ec2053 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -1376,6 +1376,11 @@ public class BlobStoreManagerService extends SystemService { } } + private boolean isAllowedBlobAccess(int uid, String packageName) { + return (!Process.isSupplemental(uid) && !Process.isIsolated(uid) + && !mPackageManagerInternal.isInstantApp(packageName, UserHandle.getUserId(uid))); + } + private class PackageChangedReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { @@ -1437,8 +1442,7 @@ public class BlobStoreManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); verifyCallingPackage(callingUid, packageName); - if (Process.isIsolated(callingUid) || mPackageManagerInternal.isInstantApp( - packageName, UserHandle.getUserId(callingUid))) { + if (!isAllowedBlobAccess(callingUid, packageName)) { throw new SecurityException("Caller not allowed to create session; " + "callingUid=" + callingUid + ", callingPackage=" + packageName); } @@ -1487,8 +1491,7 @@ public class BlobStoreManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); verifyCallingPackage(callingUid, packageName); - if (Process.isIsolated(callingUid) || mPackageManagerInternal.isInstantApp( - packageName, UserHandle.getUserId(callingUid))) { + if (!isAllowedBlobAccess(callingUid, packageName)) { throw new SecurityException("Caller not allowed to open blob; " + "callingUid=" + callingUid + ", callingPackage=" + packageName); } @@ -1519,8 +1522,7 @@ public class BlobStoreManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); verifyCallingPackage(callingUid, packageName); - if (Process.isIsolated(callingUid) || mPackageManagerInternal.isInstantApp( - packageName, UserHandle.getUserId(callingUid))) { + if (!isAllowedBlobAccess(callingUid, packageName)) { throw new SecurityException("Caller not allowed to open blob; " + "callingUid=" + callingUid + ", callingPackage=" + packageName); } @@ -1544,8 +1546,7 @@ public class BlobStoreManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); verifyCallingPackage(callingUid, packageName); - if (Process.isIsolated(callingUid) || mPackageManagerInternal.isInstantApp( - packageName, UserHandle.getUserId(callingUid))) { + if (!isAllowedBlobAccess(callingUid, packageName)) { throw new SecurityException("Caller not allowed to open blob; " + "callingUid=" + callingUid + ", callingPackage=" + packageName); } @@ -1628,8 +1629,7 @@ public class BlobStoreManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); verifyCallingPackage(callingUid, packageName); - if (Process.isIsolated(callingUid) || mPackageManagerInternal.isInstantApp( - packageName, UserHandle.getUserId(callingUid))) { + if (!isAllowedBlobAccess(callingUid, packageName)) { throw new SecurityException("Caller not allowed to open blob; " + "callingUid=" + callingUid + ", callingPackage=" + packageName); } |