Merge "Add checks whether the AVDTP element data length is valid" into oc-dev (e6852c54) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/avdt/avdt_msg.cc

+11 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		*
		******************************************************************************/

		#include <log/log.h>
		#include <string.h>
		#include "avdt_api.h"
		#include "avdt_int.h"
		@@ -604,6 +605,11 @@ static uint8_t avdt_msg_prs_cfg(tAVDT_CFG* p_cfg, uint8_t* p, uint16_t len,

		case AVDT_CAT_PROTECT:
		p_cfg->psc_mask &= ~AVDT_PSC_PROTECT;
		if (p + elem_len > p_end) {
		err = AVDT_ERR_LENGTH;
		android_errorWriteLog(0x534e4554, "78288378");
		break;
		}
		if ((elem_len + protect_offset) < AVDT_PROTECT_SIZE) {
		p_cfg->num_protect++;
		p_cfg->protect_info[protect_offset] = elem_len;
		@@ -624,6 +630,11 @@ static uint8_t avdt_msg_prs_cfg(tAVDT_CFG* p_cfg, uint8_t* p, uint16_t len,
		if (elem_len >= AVDT_CODEC_SIZE) {
		tmp = AVDT_CODEC_SIZE - 1;
		}
		if (p + tmp > p_end) {
		err = AVDT_ERR_LENGTH;
		android_errorWriteLog(0x534e4554, "78288378");
		break;
		}
		p_cfg->num_codec++;
		p_cfg->codec_info[0] = elem_len;
		memcpy(&p_cfg->codec_info[1], p, tmp);