mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-03 10:02:28 +00:00
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Brian Delwiche <delwiche@google.com>
|
|
Date: Wed, 28 Sep 2022 23:30:49 +0000
|
|
Subject: [PATCH] Fix URI check in BluetoothOppUtility.java
|
|
|
|
Bug: 225880741
|
|
Test: BT unit tests, validated against researcher POC
|
|
Tag: #security
|
|
Ignore-AOSP-First: Security
|
|
Change-Id: I65c1494023930aa23fede55936488f605c7cfe01
|
|
(cherry picked from commit d0957cfdf1fc1b36620c1545643ffbc37f0ac24c)
|
|
Merged-In: I65c1494023930aa23fede55936488f605c7cfe01
|
|
---
|
|
src/com/android/bluetooth/opp/BluetoothOppUtility.java | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
|
|
index f5d926964..3a4959fcd 100644
|
|
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
|
|
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
|
|
@@ -49,6 +49,7 @@ import android.content.pm.ResolveInfo;
|
|
import android.database.Cursor;
|
|
import android.database.sqlite.SQLiteException;
|
|
import android.os.Environment;
|
|
+import android.util.EventLog;
|
|
import android.util.Log;
|
|
|
|
import java.io.File;
|
|
@@ -70,7 +71,11 @@ public class BluetoothOppUtility {
|
|
= new ConcurrentHashMap<Uri, BluetoothOppSendFileInfo>();
|
|
|
|
public static boolean isBluetoothShareUri(Uri uri) {
|
|
- return uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString());
|
|
+ if (uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString())
|
|
+ && !uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority())) {
|
|
+ EventLog.writeEvent(0x534e4554, "225880741", -1, "");
|
|
+ }
|
|
+ return uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority());
|
|
}
|
|
|
|
public static BluetoothOppTransferInfo queryRecord(Context context, Uri uri) {
|