Merge "Sanity-check paths of files to be restored" into lmp-dev (06602441) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/BackupManagerService.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -5129,6 +5129,14 @@ public class BackupManagerService extends IBackupManager.Stub {
		}
		}

		// The path needs to be canonical
		if (info.path.contains("..") \|\| info.path.contains("//")) {
		if (MORE_DEBUG) {
		Slog.w(TAG, "Dropping invalid path " + info.path);
		}
		return false;
		}

		// Otherwise we think this file is good to go
		return true;
		}
		@@ -5680,6 +5688,14 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		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) {