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

RESTRICT AUTOMERGE

Browse Source 
Ensure caller identity is restored in CP quick-path.

Bug: 172935267
Test: PoC in bug
Change-Id: I469bde7d0a0f89c94f1234cf40983395048962e2
This commit is contained in:
Varun Shah
2020-11-18 19:59:44 +00:00
committed by Sterling Huber
parent fe16873a33
commit c99b04ebad
1 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12313,11 +12313,10 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();
try {
checkTime(startTime, "getContentProviderImpl: incProviderCountLocked"); checkTime(startTime, "getContentProviderImpl: incProviderCountLocked");
// In this case the provider instance already exists, so we can // Return the provider instance right away since it already exists.
// return it right away.
conn = incProviderCountLocked(r, cpr, token, stable); conn = incProviderCountLocked(r, cpr, token, stable);
if (conn != null && (conn.stableCount+conn.unstableCount) == 1) { if (conn != null && (conn.stableCount+conn.unstableCount) == 1) {
if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) { if (cpr.proc != null && r.setAdj <= ProcessList.PERCEPTIBLE_APP_ADJ) {
@@ -12339,7 +12338,8 @@ public class ActivityManagerService extends IActivityManager.Stub
// it, we will check whether the process still exists. Note that this doesn't // it, we will check whether the process still exists. Note that this doesn't
// completely get rid of races with LMK killing the process, but should make // completely get rid of races with LMK killing the process, but should make
// them much smaller. // them much smaller.
if (success && verifiedAdj != cpr.proc.setAdj && !isProcessAliveLocked(cpr.proc)) { if (success && verifiedAdj != cpr.proc.setAdj
&& !isProcessAliveLocked(cpr.proc)) {
success = false; success = false;
} }
maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name); maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name);
@@ -12370,9 +12370,10 @@ public class ActivityManagerService extends IActivityManager.Stub
} else { } else {
cpr.proc.verifiedAdj = cpr.proc.setAdj; cpr.proc.verifiedAdj = cpr.proc.setAdj;
} }
} finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }
}
if (!providerRunning) { if (!providerRunning) {
try { try {