diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-08-09 19:50:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-09 19:50:14 +0000 |
commit | a9ea6172320d15fa79d83981d26b31851a97b529 (patch) | |
tree | 9bc40c0ce124f8f3958b3ac75aca9fd712e757fa | |
parent | 0a60a939e00a386f65a48288d8d9a4c7213e2707 (diff) | |
parent | 616f47abce356af095e92d8571a02285917e9d92 (diff) | |
download | android_packages_providers_DownloadProvider-a9ea6172320d15fa79d83981d26b31851a97b529.tar.gz android_packages_providers_DownloadProvider-a9ea6172320d15fa79d83981d26b31851a97b529.tar.bz2 android_packages_providers_DownloadProvider-a9ea6172320d15fa79d83981d26b31851a97b529.zip |
Enforce calling identity before clearing. am: 8be3a92eb0 am: ec19fe6485 am: b3ce7976f2 am: 860239d87e
am: 616f47abce
Change-Id: I1c4ba01176abae0b984e8481e1574524f2edf09e
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index d9acc789..667a81df 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -1232,6 +1232,19 @@ public final class DownloadProvider extends ContentProvider { logVerboseOpenFileInfo(uri, mode); } + // Perform normal query to enforce caller identity access before + // clearing it to reach internal-only columns + final Cursor probeCursor = query(uri, new String[] { + Downloads.Impl._DATA }, null, null, null); + try { + if ((probeCursor == null) || (probeCursor.getCount() == 0)) { + throw new FileNotFoundException( + "No file found for " + uri + " as UID " + Binder.getCallingUid()); + } + } finally { + IoUtils.closeQuietly(probeCursor); + } + final Cursor cursor = queryCleared(uri, new String[] { Downloads.Impl._DATA, Downloads.Impl.COLUMN_STATUS, Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.COLUMN_MEDIA_SCANNED }, null, |