diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-02-07 13:05:09 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2016-02-08 17:56:15 -0700 |
| commit | 8c088f73a53813869e68a5c4671c09e8732da6d3 (patch) | |
| tree | 1867b819e1fc6afeff697981b4bfc95e41cb8ab5 /src/com/android/providers/downloads/Helpers.java | |
| parent | bb1c06b9dc2740a4055d9651c6559ac112e0c397 (diff) | |
| download | android_packages_providers_DownloadProvider-8c088f73a53813869e68a5c4671c09e8732da6d3.tar.gz android_packages_providers_DownloadProvider-8c088f73a53813869e68a5c4671c09e8732da6d3.tar.bz2 android_packages_providers_DownloadProvider-8c088f73a53813869e68a5c4671c09e8732da6d3.zip | |
Use resolved path for both checking and opening.
This avoids a race condition where someone can change a symlink
target after the security checks have passed.
Bug: 26211054
Change-Id: I5e1a2343d631109c21a4c5b2d8d00b2946756680
Diffstat (limited to 'src/com/android/providers/downloads/Helpers.java')
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index d1cc5450..d01cbff2 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -357,8 +357,6 @@ public class Helpers { static boolean isFilenameValidInExternalPackage(Context context, File file, String packageName) { try { - file = file.getCanonicalFile(); - if (containsCanonical(buildExternalStorageAppFilesDirs(packageName), file) || containsCanonical(buildExternalStorageAppObbDirs(packageName), file) || containsCanonical(buildExternalStorageAppCacheDirs(packageName), file) || @@ -380,8 +378,6 @@ public class Helpers { */ static boolean isFilenameValid(Context context, File file, boolean allowInternal) { try { - file = file.getCanonicalFile(); - if (allowInternal) { if (containsCanonical(context.getFilesDir(), file) || containsCanonical(context.getCacheDir(), file) |