diff options
| author | Geremy Condra <gcondra@google.com> | 2013-03-26 05:10:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-26 05:10:38 +0000 |
| commit | 2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8 (patch) | |
| tree | 7f85df5fca7170888ce0c7eec7213fe55bcc8764 /services | |
| parent | 48718c85b41b785cf6f6ae72beb4c5d46559b735 (diff) | |
| parent | ebab0ae105f1a6df593a4bc2549fae3ee8b2ade4 (diff) | |
| download | frameworks_base-2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8.zip frameworks_base-2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8.tar.gz frameworks_base-2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8.tar.bz2 | |
Merge "BackupManagerService files need new security labeling."
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 61eada2..b0561df 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -63,6 +63,7 @@ import android.os.ParcelFileDescriptor; import android.os.PowerManager; import android.os.Process; import android.os.RemoteException; +import android.os.SELinux; import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; @@ -743,6 +744,9 @@ class BackupManagerService extends IBackupManager.Stub { // correct directory. mBaseStateDir = new File(Environment.getSecureDataDirectory(), "backup"); mBaseStateDir.mkdirs(); + if (!SELinux.restorecon(mBaseStateDir)) { + Slog.e(TAG, "SELinux restorecon failed on " + mBaseStateDir); + } mDataDir = Environment.getDownloadCacheDirectory(); mPasswordHashFile = new File(mBaseStateDir, "pwhash"); @@ -2133,6 +2137,10 @@ class BackupManagerService extends IBackupManager.Stub { ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_TRUNCATE); + if (!SELinux.restorecon(mBackupDataName)) { + Slog.e(TAG, "SELinux restorecon failed on " + mBackupDataName); + } + mNewState = ParcelFileDescriptor.open(mNewStateName, ParcelFileDescriptor.MODE_READ_WRITE | ParcelFileDescriptor.MODE_CREATE | @@ -4572,6 +4580,10 @@ class BackupManagerService extends IBackupManager.Stub { ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_TRUNCATE); + if (!SELinux.restorecon(mBackupDataName)) { + Slog.e(TAG, "SElinux restorecon failed for " + mBackupDataName); + } + if (mTransport.getRestoreData(mBackupData) != BackupConstants.TRANSPORT_OK) { // Transport-level failure, so we wind everything up and // terminate the restore operation. |