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

am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

Browse Source 
* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored
This commit is contained in:
Jeff Vander Stoep
2014-09-23 16:24:36 +00:00
committed by Android Git Automerger
parent 660af7eb1a e2adb1ff4a
commit 25c866a8ef
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/BackupManagerService.java
View File

@@ -3390,6 +3390,14 @@ class BackupManagerService extends IBackupManager.Stub {
break;
}
// The path needs to be canonical
if (info.path.contains("..") || info.path.contains("//")) {
if (MORE_DEBUG) {
Slog.w(TAG, "Dropping invalid path " + info.path);
}
okay = false;
}
// If the policy is satisfied, go ahead and set up to pipe the
// data to the agent.
if (DEBUG && okay && mAgent != null) {