diff options
author | Christopher Tate <ctate@google.com> | 2014-10-16 13:44:00 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2014-10-16 13:56:45 -0700 |
commit | a28b5c51602ccc48f2672274dabda05d3776ccd9 (patch) | |
tree | 028943d53b964cbb0f5409cfa9214fa4a0afc109 /services/backup | |
parent | 60e74b4924dee6d033ca61854cac42768006ced5 (diff) | |
download | frameworks_base-a28b5c51602ccc48f2672274dabda05d3776ccd9.zip frameworks_base-a28b5c51602ccc48f2672274dabda05d3776ccd9.tar.gz frameworks_base-a28b5c51602ccc48f2672274dabda05d3776ccd9.tar.bz2 |
Eliminate race condition around backup completion + resumption
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state. Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.
Bug 17931760
Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
Diffstat (limited to 'services/backup')
-rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 60801fb..fea1a7a 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2855,9 +2855,12 @@ public class BackupManagerService extends IBackupManager.Stub { try { if (mSavedState != null) mSavedState.close(); } catch (IOException e) {} try { if (mBackupData != null) mBackupData.close(); } catch (IOException e) {} try { if (mNewState != null) mNewState.close(); } catch (IOException e) {} - mSavedState = mBackupData = mNewState = null; synchronized (mCurrentOpLock) { + // Current-operation callback handling requires the validity of these various + // bits of internal state as an invariant of the operation still being live. + // This means we make sure to clear all of the state in unison inside the lock. mCurrentOperations.clear(); + mSavedState = mBackupData = mNewState = null; } // If this was a pseudopackage there's no associated Activity Manager state |