mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
964877bbf6
wgetb96ee4a2d1.patch -O telephony-01.patch wgetc16e6e78c1.patch -O media-01.patch wgetd5771450d7.patch -O media-02.patch wgeta1370bd00c.patch -O nn-01.patch wgetce2776f4ca.patch -O bt-01.patch wget585f583ef5.patch -O bt-02.patch wgetc9905e7968.patch -O bt-03.patch wgetc93ec045f5.patch -O bt-04.patch wget89fb17d172.patch -O bt-05.patch wget14aed2455e.patch -O bt-06.patch wgetcd438ebc52.patch -O bt-07.patch wget27e7cdc4e5.patch -O nfc-01.patch wgetdfeb4270b8.patch -O launcher-01.patch wgetb1993f6cec.patch -O native-01.patch wgetdf4a9362cd.patch -O fwb-01.patch wgetb55563bb9d.patch -O fwb-02.patch wgeta80971a281.patch -O fwb-03.patch wget7e173b4383.patch -O fwb-04.patch wget44191b1c6b.patch -O fwb-05.patch wget8dc8dfe572.patch -O fwb-06.patch wget00a4224100.patch -O av-01.patch wget21623d1f43.patch -O settings-01.patch wgetfa5ec443d9.patch -O settings-02.patch wgetba4da9c7b3.patch -O settings-03.patch Signed-off-by: Tad <tad@spotco.us>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 89fb17d17249382f8bd5c4c9b0912447ea7ff676 Mon Sep 17 00:00:00 2001
|
|
From: Brian Delwiche <delwiche@google.com>
|
|
Date: Wed, 1 Mar 2023 00:22:59 +0000
|
|
Subject: [PATCH] Fix potential abort in btu_av_act.cc
|
|
|
|
Partner analysis shows that bta_av_rc_msg does not respect handling
|
|
established for a null browse packet, instead dispatching the null
|
|
pointer to bta_av_rc_free_browse_msg. Strictly speaking this does
|
|
not cause a UAF, as osi_free_and_reset will find the null and abort,
|
|
but it will lead to improper program termination.
|
|
|
|
Handle the case instead.
|
|
|
|
Bug: 269253349
|
|
Test: atest bluetooth_test_gd_unit
|
|
Tag: #security
|
|
Ignore-AOSP-First: Security
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3ee136851de30261e56c62fbb488541dc564b94)
|
|
Merged-In: I14dc4910476c733b246bcf7ff292afe9b7c0cc3d
|
|
Change-Id: I14dc4910476c733b246bcf7ff292afe9b7c0cc3d
|
|
---
|
|
system/bta/av/bta_av_act.cc | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
|
|
index be199a4da3..357ca0ecf6 100644
|
|
--- a/system/bta/av/bta_av_act.cc
|
|
+++ b/system/bta/av/bta_av_act.cc
|
|
@@ -1001,7 +1001,10 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) {
|
|
av.remote_cmd.rc_handle = p_data->rc_msg.handle;
|
|
(*p_cb->p_cback)(evt, &av);
|
|
/* If browsing message, then free the browse message buffer */
|
|
- bta_av_rc_free_browse_msg(p_cb, p_data);
|
|
+ if (p_data->rc_msg.opcode == AVRC_OP_BROWSE &&
|
|
+ p_data->rc_msg.msg.browse.p_browse_pkt != NULL) {
|
|
+ bta_av_rc_free_browse_msg(p_cb, p_data);
|
|
+ }
|
|
}
|
|
}
|
|
|