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>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From ce2776f4ca4fba080bd64bffa2c8fa2d0188bd45 Mon Sep 17 00:00:00 2001
|
|
From: Hui Peng <phui@google.com>
|
|
Date: Thu, 27 Apr 2023 00:50:26 +0000
|
|
Subject: [PATCH] Fix a type confusion bug in bta_av_setconfig_rej
|
|
|
|
tBTA_AV_CI_SETCONFIG is treated as tBTA_AV_STR_MSG
|
|
in bta_av_setconfig_rej, resulting OOB access.
|
|
|
|
Bug: 260230151
|
|
Test: manual
|
|
Ignore-AOSP-First: security
|
|
Tag: #security
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bbd88e88ce749aab87178e189a05e5a356d0631c)
|
|
Merged-In: I78a1ee50dea0113381e51f8521711d758dc759cf
|
|
Change-Id: I78a1ee50dea0113381e51f8521711d758dc759cf
|
|
---
|
|
system/bta/av/bta_av_aact.cc | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
|
|
index d0db36ea3e..39f95e5040 100644
|
|
--- a/system/bta/av/bta_av_aact.cc
|
|
+++ b/system/bta/av/bta_av_aact.cc
|
|
@@ -1740,14 +1740,14 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
|
|
******************************************************************************/
|
|
void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
|
|
tBTA_AV_REJECT reject;
|
|
- uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;
|
|
|
|
- bta_av_adjust_seps_idx(p_scb, avdt_handle);
|
|
+ bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);
|
|
+
|
|
LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
|
|
p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);
|
|
AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);
|
|
|
|
- reject.bd_addr = p_data->str_msg.bd_addr;
|
|
+ reject.bd_addr = p_scb->PeerAddress();
|
|
reject.hndl = p_scb->hndl;
|
|
|
|
tBTA_AV bta_av_data;
|