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

Merge "Fix checkKeyIntentParceledCorrectly's bypass" into rvc-dev am: 82a8fddc91

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20912010

Change-Id: Ia3f19e488ec06ad7bdb853ce26fafea2f59a8bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hao Ke
2023-01-11 20:02:36 +00:00
committed by Automerger Merge Worker
parent f65a29538b 82a8fddc91
commit 7952c93b10
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3430,8 +3430,7 @@ public class AccountManagerService
Bundle.setDefusable(result, true); Bundle.setDefusable(result, true);
mNumResults++; mNumResults++;
Intent intent = null; Intent intent = null;
if (result != null if (result != null) {
&& (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {
if (!checkKeyIntent( if (!checkKeyIntent(
Binder.getCallingUid(), Binder.getCallingUid(),
result)) { result)) {
@@ -4790,8 +4789,10 @@ public class AccountManagerService
EventLog.writeEvent(0x534e4554, "250588548", authUid, ""); EventLog.writeEvent(0x534e4554, "250588548", authUid, "");
return false; return false;
} }
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT); Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
if (intent == null) {
return true;
}
// Explicitly set an empty ClipData to ensure that we don't offer to // Explicitly set an empty ClipData to ensure that we don't offer to
// promote any Uris contained inside for granting purposes // promote any Uris contained inside for granting purposes
if (intent.getClipData() == null) { if (intent.getClipData() == null) {
@@ -4844,7 +4845,10 @@ public class AccountManagerService
p.recycle(); p.recycle();
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT); Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT); Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);
return (intent.filterEquals(simulateIntent)); if (intent == null) {
return (simulateIntent == null);
}
return intent.filterEquals(simulateIntent);
} }
private boolean isExportedSystemActivity(ActivityInfo activityInfo) { private boolean isExportedSystemActivity(ActivityInfo activityInfo) {
@@ -4989,8 +4993,7 @@ public class AccountManagerService
} }
} }
} }
if (result != null if (result != null) {
&& (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {
if (!checkKeyIntent( if (!checkKeyIntent(
Binder.getCallingUid(), Binder.getCallingUid(),
result)) { result)) {