test_vendor: L2cap Assemble additional error check am: cf135182cf (a84b9f42) · Commits · e / os / android_packages_modules_Bluetooth

system/vendor_libs/test_vendor_lib/src/l2cap_packet.cc

+26 −10

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ std::unique_ptr<L2capPacket> L2capPacket::assemble(
		std::unique_ptr<L2capPacket> built_l2cap_packet(new L2capPacket());
		uint16_t l2cap_payload_length = 0;
		uint16_t first_packet_channel_id = 0;
		uint16_t total_expected_l2cap_length;
		uint8_t txseq_start;

		if (sdu_packets.size() == 0) {
		@@ -85,29 +86,39 @@ std::unique_ptr<L2capPacket> L2capPacket::assemble(
		// Meanwhile all segments in between the start and end must have the bits
		// set to 11b.
		uint16_t starting_index;
		uint16_t total_expected_l2cap_length;
		uint8_t txseq = controls & kSduTxSeqBits;
		if (sdu_packets.size() == 1 && !check_if_only_sdu(continuation_bits)) {
		return nullptr;
		} else if (sdu_packets.size() > 1 && i == 0 &&
		}
		if (sdu_packets.size() > 1 && i == 0 &&
		!check_if_starting_sdu(continuation_bits)) {
		return nullptr;
		} else if (i != 0 && check_if_starting_sdu(continuation_bits)) {
		}
		if (i != 0 && check_if_starting_sdu(continuation_bits)) {
		return nullptr;
		} else if (txseq != (txseq_start + (static_cast<uint8_t>(i) << 1))) {
		}
		if (txseq != (txseq_start + (static_cast<uint8_t>(i) << 1))) {
		return nullptr;
		} else if (sdu_packets.size() > 1 && i == sdu_packets.size() - 1 &&
		}
		if (sdu_packets.size() > 1 && i == sdu_packets.size() - 1 &&
		!check_if_ending_sdu(continuation_bits)) {
		return nullptr;
		} else if (check_if_starting_sdu(continuation_bits)) {
		}

		// Subtract the control and fcs from every SDU payload length.
		l2cap_payload_length += (payload_length - 4);

		if (check_if_starting_sdu(continuation_bits)) {
		starting_index = kSduFirstHeaderLength;
		total_expected_l2cap_length = sdu_packets[i].get_total_l2cap_length();

		// Subtract the additional two bytes from the first packet of a segmented
		// SDU.
		l2cap_payload_length -= 2;
		} else {
		starting_index = kSduStandardHeaderLength;
		}

		l2cap_payload_length += (payload_length - 2);

		auto payload_begin = sdu_packets[i].get_payload_begin(starting_index);
		auto payload_end = sdu_packets[i].get_payload_end();

		@@ -115,6 +126,11 @@ std::unique_ptr<L2capPacket> L2capPacket::assemble(
		built_l2cap_packet->l2cap_packet_.end(), payload_begin, payload_end);
		}

		if (l2cap_payload_length != total_expected_l2cap_length &&
		sdu_packets.size() > 1) {
		return nullptr;
		}

		built_l2cap_packet->l2cap_packet_[0] = l2cap_payload_length & 0xff;
		built_l2cap_packet->l2cap_packet_[1] = (l2cap_payload_length & 0xff00) >> 8;
		built_l2cap_packet->l2cap_packet_[2] = first_packet_channel_id & 0xff;