mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-17 03:44:45 -05:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
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 6b1dcc2c9..d6211d701 100644
|
|
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
|
|
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
|
|
@@ -45,6 +45,7 @@ import android.content.pm.ResolveInfo;
|
|
import android.database.Cursor;
|
|
import android.net.Uri;
|
|
import android.os.Environment;
|
|
+import android.util.EventLog;
|
|
import android.util.Log;
|
|
|
|
import com.android.bluetooth.R;
|
|
@@ -71,7 +72,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) {
|