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

Merge "Don't allow sdk sandbox processes to register/unregister CPs" into tm-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2022-03-28 17:41:13 +00:00
committed by Android (Google) Code Review
parent 8f7bd454d6 a6b7d97705
commit 4baae1f703
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/ContentProviderHelper.java
View File

@@ -112,6 +112,13 @@ public class ContentProviderHelper {
ContentProviderHolder getContentProvider(IApplicationThread caller, String callingPackage, ContentProviderHolder getContentProvider(IApplicationThread caller, String callingPackage,
String name, int userId, boolean stable) { String name, int userId, boolean stable) {
mService.enforceNotIsolatedCaller("getContentProvider"); mService.enforceNotIsolatedCaller("getContentProvider");
if (Process.isSdkSandboxUid(Binder.getCallingUid())) {
// TODO(b/226318628): for sdk sandbox processes only allow accessing CPs registered by
// the WebView apk.
Slog.w(TAG, "Sdk sandbox process " + Binder.getCallingUid()
+ " is accessing content provider " + name
+ ". This access will most likely be blocked in the future");
}
if (caller == null) { if (caller == null) {
String msg = "null IApplicationThread when getting content provider " + name; String msg = "null IApplicationThread when getting content provider " + name;
Slog.w(TAG, msg); Slog.w(TAG, msg);
@@ -630,7 +637,7 @@ public class ContentProviderHelper {
return; return;
} }
mService.enforceNotIsolatedCaller("publishContentProviders"); mService.enforceNotIsolatedOrSdkSandboxCaller("publishContentProviders");
synchronized (mService) { synchronized (mService) {
final ProcessRecord r = mService.getRecordForAppLOSP(caller); final ProcessRecord r = mService.getRecordForAppLOSP(caller);
if (DEBUG_MU) { if (DEBUG_MU) {
@@ -717,7 +724,7 @@ public class ContentProviderHelper {
* Drop a content provider from a ProcessRecord's bookkeeping * Drop a content provider from a ProcessRecord's bookkeeping
*/ */
void removeContentProvider(IBinder connection, boolean stable) { void removeContentProvider(IBinder connection, boolean stable) {
mService.enforceNotIsolatedCaller("removeContentProvider"); mService.enforceNotIsolatedOrSdkSandboxCaller("removeContentProvider");
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
try { try {
ContentProviderConnection conn; ContentProviderConnection conn;