diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-08-09 19:41:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-09 19:41:46 +0000 |
| commit | b3ce7976f2992c0a9860692bc1f766ff1cc6cd29 (patch) | |
| tree | ebc6e6d3feee6554a4c439b5e8d5ef7b13d3c793 | |
| parent | ae7d56abe493e7896a24024d1cf0d16e55609e6e (diff) | |
| parent | ec19fe64858d6f702a01d094ce9c5b449baab7a1 (diff) | |
| download | android_packages_providers_DownloadProvider-b3ce7976f2992c0a9860692bc1f766ff1cc6cd29.tar.gz android_packages_providers_DownloadProvider-b3ce7976f2992c0a9860692bc1f766ff1cc6cd29.tar.bz2 android_packages_providers_DownloadProvider-b3ce7976f2992c0a9860692bc1f766ff1cc6cd29.zip | |
Enforce calling identity before clearing. am: 8be3a92eb0
am: ec19fe6485
Change-Id: Ib82ee386c9b72a35172a4a205a72aba5d3c3134e
| -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 2d914c41..d2a9d847 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -1192,6 +1192,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, |