2023-09-07 21:23:50 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2023-09-05 20:50:31 -04:00
|
|
|
From: Hui Peng <phui@google.com>
|
|
|
|
|
Date: Wed, 10 May 2023 23:34:20 +0000
|
|
|
|
|
Subject: [PATCH] Fix an integer overflow bug in avdt_msg_asmbl
|
|
|
|
|
|
|
|
|
|
Bug: 280633699
|
|
|
|
|
Test: manual
|
|
|
|
|
Ignore-AOSP-First: security
|
|
|
|
|
Tag: #security
|
|
|
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bf9449a704c2983861dbe0ede9ab660e42826179)
|
|
|
|
|
Merged-In: Iaa4d603921fc4ffb8cfb5783f99ec0963affd6a2
|
|
|
|
|
Change-Id: Iaa4d603921fc4ffb8cfb5783f99ec0963affd6a2
|
|
|
|
|
---
|
|
|
|
|
stack/avdt/avdt_msg.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/stack/avdt/avdt_msg.c b/stack/avdt/avdt_msg.c
|
2023-09-07 21:23:50 -04:00
|
|
|
index acda49858..ce2340d34 100644
|
2023-09-05 20:50:31 -04:00
|
|
|
--- a/stack/avdt/avdt_msg.c
|
|
|
|
|
+++ b/stack/avdt/avdt_msg.c
|
2023-09-07 21:23:50 -04:00
|
|
|
@@ -1455,14 +1455,14 @@ BT_HDR *avdt_msg_asmbl(tAVDT_CCB *p_ccb, BT_HDR *p_buf)
|
2023-09-05 20:50:31 -04:00
|
|
|
* NOTE: The buffer is allocated above at the beginning of the
|
|
|
|
|
* reassembly, and is always of size BT_DEFAULT_BUFFER_SIZE.
|
|
|
|
|
*/
|
|
|
|
|
- UINT16 buf_len = BT_DEFAULT_BUFFER_SIZE - sizeof(BT_HDR);
|
|
|
|
|
+ size_t buf_len = BT_DEFAULT_BUFFER_SIZE - sizeof(BT_HDR);
|
|
|
|
|
|
|
|
|
|
/* adjust offset and len of fragment for header byte */
|
|
|
|
|
p_buf->offset += AVDT_LEN_TYPE_CONT;
|
|
|
|
|
p_buf->len -= AVDT_LEN_TYPE_CONT;
|
|
|
|
|
|
|
|
|
|
/* verify length */
|
|
|
|
|
- if ((p_ccb->p_rx_msg->offset + p_buf->len) > buf_len) {
|
|
|
|
|
+ if (((size_t) p_ccb->p_rx_msg->offset + (size_t) p_buf->len) > buf_len) {
|
|
|
|
|
/* won't fit; free everything */
|
|
|
|
|
AVDT_TRACE_WARNING("%s: Fragmented message too big!", __func__);
|
|
|
|
|
osi_free_and_reset((void **)&p_ccb->p_rx_msg);
|
