summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2022-03-28 16:10:52 -0700
committerMakoto Onuki <omakoto@google.com>2022-03-30 16:49:12 +0000
commit4df2de83804c33ef5389c7d6d1178abe37292cee (patch)
tree2937d06084e4bbfc4c001779de2581b15e8f032b /core/java/android
parent319a36fe50729f8f1ac154a23d357dfaf4a7239a (diff)
Only allow the system server to connect to sync adapters
Bug: 203229608 Test: Manual test with changing the check logic Change-Id: I27ade06541e79746f6c1318296cd11cb7fd5da21
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/AbstractThreadedSyncAdapter.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java
index a086a308d0d9..c4ac483fd10e 100644
--- a/core/java/android/content/AbstractThreadedSyncAdapter.java
+++ b/core/java/android/content/AbstractThreadedSyncAdapter.java
@@ -21,6 +21,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
import android.accounts.Account;
import android.annotation.MainThread;
import android.annotation.NonNull;
+import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -171,8 +172,17 @@ public abstract class AbstractThreadedSyncAdapter {
}
private class ISyncAdapterImpl extends ISyncAdapter.Stub {
+ private void enforceCallerSystem() {
+ final long callingUid = Binder.getCallingUid();
+ if (callingUid != Process.SYSTEM_UID) {
+ android.util.EventLog.writeEvent(0x534e4554, "203229608", -1, "");
+ return;
+ }
+ }
+
@Override
public void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb) {
+ enforceCallerSystem();
Handler.getMain().sendMessage(obtainMessage(
AbstractThreadedSyncAdapter::handleOnUnsyncableAccount,
AbstractThreadedSyncAdapter.this, cb));
@@ -187,6 +197,8 @@ public abstract class AbstractThreadedSyncAdapter {
}
Log.d(TAG, "startSync() start " + authority + " " + account + " " + extras);
}
+ enforceCallerSystem();
+
try {
final SyncContext syncContextClient = new SyncContext(syncContext);
@@ -242,6 +254,7 @@ public abstract class AbstractThreadedSyncAdapter {
@Override
public void cancelSync(ISyncContext syncContext) {
+ enforceCallerSystem();
try {
// synchronize to make sure that mSyncThreads doesn't change between when we
// check it and when we use it