mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-04 02:21:22 +00:00
0dde119d7e
QPR3 is delayed a week now Patches pulled from GrapheneOS and checked against CalyxOS Signed-off-by: Tad <tad@spotco.us>
129 lines
4.9 KiB
Diff
129 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Brian Delwiche <delwiche@google.com>
|
|
Date: Tue, 21 Mar 2023 22:34:41 +0000
|
|
Subject: [PATCH 2/2] Revert "Revert "Validate buffer length in
|
|
sdpu_build_uuid_seq""
|
|
|
|
This reverts commit e6cf2700522cf639d8115b025833edc24702c7e9.
|
|
|
|
Reason for revert: Reinstate original change for QPR
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4a33fbcfdb10a16760ef208f1f12a71c1be2d084)
|
|
Merged-In: I3e039f1b8f8ffbcc4875b663d417462451fb76a0
|
|
Change-Id: I3e039f1b8f8ffbcc4875b663d417462451fb76a0
|
|
---
|
|
system/stack/sdp/sdp_discovery.cc | 58 ++++++++++++++++++++++++++++---
|
|
1 file changed, 53 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/system/stack/sdp/sdp_discovery.cc b/system/stack/sdp/sdp_discovery.cc
|
|
index 22d6e7caf4..654f899a89 100644
|
|
--- a/system/stack/sdp/sdp_discovery.cc
|
|
+++ b/system/stack/sdp/sdp_discovery.cc
|
|
@@ -70,10 +70,15 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
|
|
*
|
|
******************************************************************************/
|
|
static uint8_t* sdpu_build_uuid_seq(uint8_t* p_out, uint16_t num_uuids,
|
|
- Uuid* p_uuid_list) {
|
|
+ Uuid* p_uuid_list, uint16_t& bytes_left) {
|
|
uint16_t xx;
|
|
uint8_t* p_len;
|
|
|
|
+ if (bytes_left < 2) {
|
|
+ DCHECK(0) << "SDP: No space for data element header";
|
|
+ return (p_out);
|
|
+ }
|
|
+
|
|
/* First thing is the data element header */
|
|
UINT8_TO_BE_STREAM(p_out, (DATA_ELE_SEQ_DESC_TYPE << 3) | SIZE_IN_NEXT_BYTE);
|
|
|
|
@@ -81,9 +86,20 @@ static uint8_t* sdpu_build_uuid_seq(uint8_t* p_out, uint16_t num_uuids,
|
|
p_len = p_out;
|
|
p_out += 1;
|
|
|
|
+ /* Account for data element header and length */
|
|
+ bytes_left -= 2;
|
|
+
|
|
/* Now, loop through and put in all the UUID(s) */
|
|
for (xx = 0; xx < num_uuids; xx++, p_uuid_list++) {
|
|
int len = p_uuid_list->GetShortestRepresentationSize();
|
|
+
|
|
+ if (len + 1 > bytes_left) {
|
|
+ DCHECK(0) << "SDP: Too many UUIDs for internal buffer";
|
|
+ break;
|
|
+ } else {
|
|
+ bytes_left -= (len + 1);
|
|
+ }
|
|
+
|
|
if (len == Uuid::kNumBytes16) {
|
|
UINT8_TO_BE_STREAM(p_out, (UUID_DESC_TYPE << 3) | SIZE_TWO_BYTES);
|
|
UINT16_TO_BE_STREAM(p_out, p_uuid_list->As16Bit());
|
|
@@ -120,6 +136,7 @@ static void sdp_snd_service_search_req(tCONN_CB* p_ccb, uint8_t cont_len,
|
|
uint8_t *p, *p_start, *p_param_len;
|
|
BT_HDR* p_cmd = (BT_HDR*)osi_malloc(SDP_DATA_BUF_SIZE);
|
|
uint16_t param_len;
|
|
+ uint16_t bytes_left = SDP_DATA_BUF_SIZE;
|
|
|
|
/* Prepare the buffer for sending the packet to L2CAP */
|
|
p_cmd->offset = L2CAP_MIN_OFFSET;
|
|
@@ -134,9 +151,24 @@ static void sdp_snd_service_search_req(tCONN_CB* p_ccb, uint8_t cont_len,
|
|
p_param_len = p;
|
|
p += 2;
|
|
|
|
-/* Build the UID sequence. */
|
|
+ /* Account for header size, max service record count and
|
|
+ * continuation state */
|
|
+ const uint16_t base_bytes = (sizeof(BT_HDR) + L2CAP_MIN_OFFSET +
|
|
+ 3u + /* service search request header */
|
|
+ 2u + /* param len */
|
|
+ 3u + ((p_cont) ? cont_len : 0));
|
|
+
|
|
+ if (base_bytes > bytes_left) {
|
|
+ DCHECK(0) << "SDP: Overran SDP data buffer";
|
|
+ osi_free(p_cmd);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ bytes_left -= base_bytes;
|
|
+
|
|
+ /* Build the UID sequence. */
|
|
p = sdpu_build_uuid_seq(p, p_ccb->p_db->num_uuid_filters,
|
|
- p_ccb->p_db->uuid_filters);
|
|
+ p_ccb->p_db->uuid_filters, bytes_left);
|
|
|
|
/* Set max service record count */
|
|
UINT16_TO_BE_STREAM(p, sdp_cb.max_recs_per_search);
|
|
@@ -562,6 +594,7 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply,
|
|
if ((cont_request_needed) || (!p_reply)) {
|
|
BT_HDR* p_msg = (BT_HDR*)osi_malloc(SDP_DATA_BUF_SIZE);
|
|
uint8_t* p;
|
|
+ uint16_t bytes_left = SDP_DATA_BUF_SIZE;
|
|
|
|
p_msg->offset = L2CAP_MIN_OFFSET;
|
|
p = p_start = (uint8_t*)(p_msg + 1) + L2CAP_MIN_OFFSET;
|
|
@@ -575,9 +608,24 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply,
|
|
p_param_len = p;
|
|
p += 2;
|
|
|
|
-/* Build the UID sequence. */
|
|
+ /* Account for header size, max service record count and
|
|
+ * continuation state */
|
|
+ const uint16_t base_bytes = (sizeof(BT_HDR) + L2CAP_MIN_OFFSET +
|
|
+ 3u + /* service search request header */
|
|
+ 2u + /* param len */
|
|
+ 3u + /* max service record count */
|
|
+ ((p_reply) ? (*p_reply) : 0));
|
|
+
|
|
+ if (base_bytes > bytes_left) {
|
|
+ sdp_disconnect(p_ccb, SDP_INVALID_CONT_STATE);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ bytes_left -= base_bytes;
|
|
+
|
|
+ /* Build the UID sequence. */
|
|
p = sdpu_build_uuid_seq(p, p_ccb->p_db->num_uuid_filters,
|
|
- p_ccb->p_db->uuid_filters);
|
|
+ p_ccb->p_db->uuid_filters, bytes_left);
|
|
|
|
/* Max attribute byte count */
|
|
UINT16_TO_BE_STREAM(p, sdp_cb.max_attr_list_size);
|