mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-08-03 11:56:09 -04:00
Pull in old cherrypicks + 5 missing patches from syphyr
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
df3db92d5a
commit
202033c013
89 changed files with 7138 additions and 15 deletions
33
Patches/LineageOS-14.1/android_system_bt/334033.patch
Normal file
33
Patches/LineageOS-14.1/android_system_bt/334033.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Escande <wescande@google.com>
|
||||
Date: Mon, 2 May 2022 09:48:59 -0700
|
||||
Subject: [PATCH] Check Avrcp packet vendor length before extracting length
|
||||
|
||||
Bug: 205571133
|
||||
Test: build + ag/18105403 for sts test
|
||||
Ignore-AOSP-First: Security vulnerability
|
||||
Change-Id: Ic9fa9400ab15785cfdb251af66b1867daf09570e
|
||||
(cherry picked from commit 003e42896493afb7a0cd7406720987725d4e9da3)
|
||||
Merged-In: Ic9fa9400ab15785cfdb251af66b1867daf09570e
|
||||
---
|
||||
stack/avrc/avrc_pars_tg.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/stack/avrc/avrc_pars_tg.c b/stack/avrc/avrc_pars_tg.c
|
||||
index 78bd18a43..d976a0d14 100644
|
||||
--- a/stack/avrc/avrc_pars_tg.c
|
||||
+++ b/stack/avrc/avrc_pars_tg.c
|
||||
@@ -44,6 +44,13 @@ static tAVRC_STS avrc_ctrl_pars_vendor_cmd(tAVRC_MSG_VENDOR *p_msg, tAVRC_COMMAN
|
||||
{
|
||||
tAVRC_STS status = AVRC_STS_NO_ERROR;
|
||||
|
||||
+ if (p_msg->vendor_len < 4)
|
||||
+ { /* 4 == pdu + reserved byte + len as uint16 */
|
||||
+ AVRC_TRACE_WARNING("%s: message length %d too short: must be at least 4",
|
||||
+ __func__, p_msg->vendor_len);
|
||||
+ android_errorWriteLog(0x534e4554, "205571133");
|
||||
+ return AVRC_STS_INTERNAL_ERR;
|
||||
+ }
|
||||
UINT8 *p = p_msg->p_vendor_data;
|
||||
p_result->pdu = *p++;
|
||||
AVRC_TRACE_DEBUG("%s pdu:0x%x", __func__, p_result->pdu);
|
Loading…
Add table
Add a link
Reference in a new issue