summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/downloads
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-02-16 16:10:32 -0700
committerJeff Sharkey <jsharkey@android.com>2016-02-16 16:10:32 -0700
commitc0b05b37d7af47455c54fdd0dac4c39f2cf8e5dd (patch)
treeb6db650366af781f3c698c45601a0a4320016258 /src/com/android/providers/downloads
parent366af2ee1f841615d44ab770b537112d769eed05 (diff)
downloadandroid_packages_providers_DownloadProvider-c0b05b37d7af47455c54fdd0dac4c39f2cf8e5dd.tar.gz
android_packages_providers_DownloadProvider-c0b05b37d7af47455c54fdd0dac4c39f2cf8e5dd.tar.bz2
android_packages_providers_DownloadProvider-c0b05b37d7af47455c54fdd0dac4c39f2cf8e5dd.zip
DO NOT MERGE. Use resolved path when inserting and deleting.
This avoids a race condition where someone can change a symlink target after the security checks have passed. Bug: 26211054 Change-Id: I03b06b746fde5d08d6b61a7011bdace0b4e9fa77
Diffstat (limited to 'src/com/android/providers/downloads')
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 620085fc..d9acc789 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -715,7 +715,13 @@ public final class DownloadProvider extends ContentProvider {
throw new IllegalArgumentException("Invalid file URI: " + uri);
}
- final File file = new File(path);
+ final File file;
+ try {
+ file = new File(path).getCanonicalFile();
+ } catch (IOException e) {
+ throw new SecurityException(e);
+ }
+
if (Helpers.isFilenameValidInExternalPackage(getContext(), file, getCallingPackage())) {
// No permissions required for paths belonging to calling package
return;
@@ -1191,10 +1197,14 @@ public final class DownloadProvider extends ContentProvider {
final String path = cursor.getString(1);
if (!TextUtils.isEmpty(path)) {
- final File file = new File(path);
- if (Helpers.isFilenameValid(getContext(), file)) {
- Log.v(Constants.TAG, "Deleting " + file + " via provider delete");
- file.delete();
+ try {
+ final File file = new File(path).getCanonicalFile();
+ if (Helpers.isFilenameValid(getContext(), file)) {
+ Log.v(Constants.TAG,
+ "Deleting " + file + " via provider delete");
+ file.delete();
+ }
+ } catch (IOException ignored) {
}
}
}