diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-08-09 20:04:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-09 20:04:51 +0000 |
| commit | 7bd19160b10ca48f6434849ca3f5fbe21f72cabf (patch) | |
| tree | b957474870e000cd114a5762612dc523ec52cbfc /src/com/android | |
| parent | 7a117b0afd2a3ba61d50d8e82cec69f94b6125fb (diff) | |
| parent | 77b7d909399daf026df06740096217d00cb426eb (diff) | |
| download | android_packages_providers_DownloadProvider-7bd19160b10ca48f6434849ca3f5fbe21f72cabf.tar.gz android_packages_providers_DownloadProvider-7bd19160b10ca48f6434849ca3f5fbe21f72cabf.tar.bz2 android_packages_providers_DownloadProvider-7bd19160b10ca48f6434849ca3f5fbe21f72cabf.zip | |
Enforce calling identity before clearing. am: 8be3a92eb0 am: ec19fe6485 am: b3ce7976f2 am: 860239d87e am: 616f47abce am: a9ea617232 am: 567e549614 am: 14ae5650e4 am: 80ab64c562
am: 77b7d90939
Change-Id: I634d3d6d5918d2a65061e101ba1425735047184d
Diffstat (limited to 'src/com/android')
| -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 d30018f7..a4bc9fef 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -1260,6 +1260,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, |