Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev (ddc77ae8) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/sdp/sdp_db.cc

+5 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,11 @@ static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len, uint8_t* p_uuid,

		while (p < p_end) {
		type = *p++;
		p = sdpu_get_len_from_type(p, type, &len);
		p = sdpu_get_len_from_type(p, p_end, type, &len);
		if (p == NULL \|\| (p + len) > p_end) {
		SDP_TRACE_WARNING("%s: bad length", __func__);
		break;
		}
		type = type >> 3;
		if (type == UUID_DESC_TYPE) {
		if (sdpu_compare_uuid_arrays(p, len, p_uuid, uuid_len)) return (true);

system/stack/sdp/sdp_discovery.cc

+24 −9

Original line number	Diff line number	Diff line
		@@ -344,6 +344,7 @@ static void sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) {
		unsigned int cpy_len, rem_len;
		uint32_t list_len;
		uint8_t* p;
		uint8_t* p_end;
		uint8_t type;

		#if (SDP_DEBUG_RAW == TRUE)
		@@ -361,12 +362,17 @@ static void sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) {
		cpy_len = p_ccb->p_db->raw_size - p_ccb->p_db->raw_used;
		list_len = p_ccb->list_len;
		p = &p_ccb->rsp_list[0];
		p_end = &p_ccb->rsp_list[0] + list_len;

		if (offset) {
		cpy_len -= 1;
		type = *p++;
		uint8_t* old_p = p;
		p = sdpu_get_len_from_type(p, type, &list_len);
		p = sdpu_get_len_from_type(p, p_end, type, &list_len);
		if (p == NULL \|\| (p + list_len) > p_end) {
		SDP_TRACE_WARNING("%s: bad length", __func__);
		return;
		}
		if ((int)cpy_len < (p - old_p)) {
		SDP_TRACE_WARNING("%s: no bytes left for data", __func__);
		return;
		@@ -694,8 +700,11 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply,
		SDP_TRACE_WARNING("SDP - Wrong type: 0x%02x in attr_rsp", type);
		return;
		}
		p = sdpu_get_len_from_type(p, type, &seq_len);

		p = sdpu_get_len_from_type(p, p + p_ccb->list_len, type, &seq_len);
		if (p == NULL \|\| (p + seq_len) > (p + p_ccb->list_len)) {
		SDP_TRACE_WARNING("%s: bad length", __func__);
		return;
		}
		p_end = &p_ccb->rsp_list[p_ccb->list_len];

		if ((p + seq_len) != p_end) {
		@@ -737,9 +746,8 @@ static uint8_t* save_attr_seq(tCONN_CB* p_ccb, uint8_t* p, uint8_t* p_msg_end) {
		SDP_TRACE_WARNING("SDP - Wrong type: 0x%02x in attr_rsp", type);
		return (NULL);
		}

		p = sdpu_get_len_from_type(p, type, &seq_len);
		if ((p + seq_len) > p_msg_end) {
		p = sdpu_get_len_from_type(p, p_msg_end, type, &seq_len);
		if (p == NULL \|\| (p + seq_len) > p_msg_end) {
		SDP_TRACE_WARNING("SDP - Bad len in attr_rsp %d", seq_len);
		return (NULL);
		}
		@@ -756,7 +764,11 @@ static uint8_t* save_attr_seq(tCONN_CB* p_ccb, uint8_t* p, uint8_t* p_msg_end) {
		while (p < p_seq_end) {
		/* First get the attribute ID */
		type = *p++;
		p = sdpu_get_len_from_type(p, type, &attr_len);
		p = sdpu_get_len_from_type(p, p_msg_end, type, &attr_len);
		if (p == NULL \|\| (p + attr_len) > p_seq_end) {
		SDP_TRACE_WARNING("%s: Bad len in attr_rsp %d", __func__, attr_len);
		return (NULL);
		}
		if (((type >> 3) != UINT_DESC_TYPE) \|\| (attr_len != 2)) {
		SDP_TRACE_WARNING("SDP - Bad type: 0x%02x or len: %d in attr_rsp", type,
		attr_len);
		@@ -840,8 +852,11 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
		nest_level &= ~(SDP_ADDITIONAL_LIST_MASK);

		type = *p++;
		p = sdpu_get_len_from_type(p, type, &attr_len);

		p = sdpu_get_len_from_type(p, p_end, type, &attr_len);
		if (p == NULL \|\| (p + attr_len) > p_end) {
		SDP_TRACE_WARNING("%s: bad length in attr_rsp", __func__);
		return NULL;
		}
		attr_len &= SDP_DISC_ATTR_LEN_MASK;
		attr_type = (type >> 3) & 0x0f;

system/stack/sdp/sdp_utils.cc

+14 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,8 @@ uint8_t* sdpu_extract_attr_seq(uint8_t* p, uint16_t param_len,
		* Returns void
		*
		******************************************************************************/
		uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t type, uint32_t* p_len) {
		uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type,
		uint32_t* p_len) {
		uint8_t u8;
		uint16_t u16;
		uint32_t u32;
		@@ -564,14 +565,26 @@ uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t type, uint32_t* p_len) {
		*p_len = 16;
		break;
		case SIZE_IN_NEXT_BYTE:
		if (p + 1 > p_end) {
		*p_len = 0;
		return NULL;
		}
		BE_STREAM_TO_UINT8(u8, p);
		*p_len = u8;
		break;
		case SIZE_IN_NEXT_WORD:
		if (p + 2 > p_end) {
		*p_len = 0;
		return NULL;
		}
		BE_STREAM_TO_UINT16(u16, p);
		*p_len = u16;
		break;
		case SIZE_IN_NEXT_LONG:
		if (p + 4 > p_end) {
		*p_len = 0;
		return NULL;
		}
		BE_STREAM_TO_UINT32(u32, p);
		*p_len = (uint16_t)u32;
		break;

system/stack/sdp/sdpint.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ extern uint8_t* sdpu_extract_attr_seq(uint8_t* p, uint16_t param_len,
		extern uint8_t* sdpu_extract_uid_seq(uint8_t* p, uint16_t param_len,
		tSDP_UUID_SEQ* p_seq);

		extern uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t type,
		extern uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type,
		uint32_t* p_len);
		extern bool sdpu_is_base_uuid(uint8_t* p_uuid);
		extern bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1,