diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-02-16 15:47:03 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@google.com> | 2016-02-16 23:08:45 +0000 |
commit | ebb842e081f2d9eddbeddb9447631fd81e8961b9 (patch) | |
tree | 4f8bcf712f853285582f0fdaaeda97ca2940b9b4 /src/com/android | |
parent | e33446d2dc4846df0fe93da49090b990e2db9267 (diff) | |
download | android_packages_providers_DownloadProvider-ebb842e081f2d9eddbeddb9447631fd81e8961b9.tar.gz android_packages_providers_DownloadProvider-ebb842e081f2d9eddbeddb9447631fd81e8961b9.tar.bz2 android_packages_providers_DownloadProvider-ebb842e081f2d9eddbeddb9447631fd81e8961b9.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: I40ed6d2298e4b66b4f7a055e68d9820515adf351
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 20 |
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) { } } } |