mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
|
From 2786005045df9d37fc4de14e5e4f60b9d5ec59b7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dmitry Dementyev <dementyev@google.com>
|
||
|
|
Date: Tue, 26 Mar 2024 10:31:44 -0700
|
||
|
|
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
|
||
|
|
|
||
|
|
Another verification is needed after Bundle modification.
|
||
|
|
Bug: 321941232
|
||
|
|
Test: manual
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36db8a1d61a881f89fdd3911886adcda6e1f0d7f)
|
||
|
|
Merged-In: I9e45d758a2320328da5664b6341eafe6f285f297
|
||
|
|
Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
|
||
|
|
---
|
||
|
|
.../android/server/accounts/AccountManagerService.java | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
index 126955add01a9..6ae79ec2e4aaa 100644
|
||
|
|
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
@@ -2971,6 +2971,11 @@ public void onResult(Bundle result) {
|
||
|
|
|
||
|
|
// Strip auth token from result.
|
||
|
|
result.remove(AccountManager.KEY_AUTHTOKEN);
|
||
|
|
+ if (!checkKeyIntent(Binder.getCallingUid(), result)) {
|
||
|
|
+ onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
|
||
|
|
+ "invalid intent in bundle returned");
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (Log.isLoggable(TAG, Log.VERBOSE)) {
|
||
|
|
Log.v(TAG,
|
||
|
|
@@ -4402,6 +4407,11 @@ public void onResult(Bundle result) {
|
||
|
|
} else {
|
||
|
|
if (mStripAuthTokenFromResult) {
|
||
|
|
result.remove(AccountManager.KEY_AUTHTOKEN);
|
||
|
|
+ if (!checkKeyIntent(Binder.getCallingUid(), result)) {
|
||
|
|
+ onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,
|
||
|
|
+ "invalid intent in bundle returned");
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
if (Log.isLoggable(TAG, Log.VERBOSE)) {
|
||
|
|
Log.v(TAG, getClass().getSimpleName()
|