DO NOT MERGE Check a2dp packet length is zero (05889eb8) · Commits · e / os / android_packages_modules_Bluetooth

TEST_MAPPING

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,10 @@
	"name" : "net_test_stack_gatt_native",		"name" : "net_test_stack_gatt_native",
	"host" : true		"host" : true
	},		},
			{
			"name" : "net_test_stack_a2dp_native",
			"host" : true
			},
	{		{
	"name" : "net_test_btif_config_cache",		"name" : "net_test_btif_config_cache",
	"host" : true		"host" : true

system/stack/Android.bp

+33 −0

Original line number	Original line	Diff line number	Diff line
	@@ -502,3 +502,36 @@ cc_test {
	misc_undefined: ["bounds"],		misc_undefined: ["bounds"],
	},		},
	}		}

			cc_test {
			name: "net_test_stack_a2dp_native",
			defaults: ["fluoride_defaults"],
			test_suites: ["device-tests"],
			host_supported: true,
			include_dirs: [
			"external/libldac/inc",
			"packages/modules/Bluetooth/system",
			"packages/modules/Bluetooth/system/stack/include",
			],
			srcs: [
			"test/a2dp/a2dp_vendor_ldac_decoder_test.cc",
			"test/a2dp/misc_fake.cc",
			],
			shared_libs: [
			"libcrypto",
			"libcutils",
			"libprotobuf-cpp-lite",
			],
			static_libs: [
			"libbt-common",
			"libbt-protos-lite",
			"liblog",
			"libosi",
			"libosi-AllocationTestHarness",
			],
			sanitize: {
			address: true,
			cfi: true,
			misc_undefined: ["bounds"],
			},
			}

system/stack/a2dp/a2dp_vendor_ldac_decoder.cc

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -203,11 +203,23 @@ void a2dp_vendor_ldac_decoder_cleanup(void) {
	}		}

	bool a2dp_vendor_ldac_decoder_decode_packet(BT_HDR* p_buf) {		bool a2dp_vendor_ldac_decoder_decode_packet(BT_HDR* p_buf) {
	pthread_mutex_lock(&(a2dp_ldac_decoder_cb.mutex));		if (p_buf == nullptr) {
			LOG(ERROR) << __func__ << "Dropping packet with nullptr";
			return false;
			}

	unsigned char* pBuffer =		unsigned char* pBuffer =
	reinterpret_cast<unsigned char*>(p_buf->data + p_buf->offset);		reinterpret_cast<unsigned char*>(p_buf->data + p_buf->offset);
	// unsigned int bufferSize = p_buf->len;		// unsigned int bufferSize = p_buf->len;
	unsigned int bytesValid = p_buf->len;		unsigned int bytesValid = p_buf->len;

			if (bytesValid == 0) {
			LOG(WARNING) << __func__ << "Dropping packet with zero length";
			return false;
			}

			pthread_mutex_lock(&(a2dp_ldac_decoder_cb.mutex));

	LDACBT_SMPL_FMT_T fmt;		LDACBT_SMPL_FMT_T fmt;
	int bs_bytes, frame_number;		int bs_bytes, frame_number;

system/stack/include/ldacBT_bco_for_fluoride.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@ extern "C" {
	#endif /* LDAC_BCO_API */		#endif /* LDAC_BCO_API */

	/* This file contains the definitions, declarations and macros for an		/* This file contains the definitions, declarations and macros for an
	* implimentation of LDAC buffer control operation.		* implementation of LDAC buffer control operation.
	*/		*/

	#define LDAC_BCO_ERR_NONE 0		#define LDAC_BCO_ERR_NONE 0

system/stack/test/a2dp/a2dp_vendor_ldac_decoder_test.cc

0 → 100644

+68 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2020 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include <base/logging.h>
			#include <gtest/gtest.h>
			#include <stdio.h>
			#include <cstdint>

			#include "stack/include/ldacBT_bco_for_fluoride.h"

			#include "osi/test/AllocationTestHarness.h"
			#undef LOG_TAG
			#include "stack/a2dp/a2dp_vendor_ldac_decoder.cc"

			extern void allocation_tracker_uninit(void);
			namespace {

			uint8_t* Data(BT_HDR* packet) { return packet->data + packet->offset; }

			} // namespace

			/**
			* Test class to test selected functionality in stack/a2dp
			*/
			class A2dpStackTest : public AllocationTestHarness {
			protected:
			void SetUp() override {
			AllocationTestHarness::SetUp();
			// Disable our allocation tracker to allow ASAN full range
			allocation_tracker_uninit();
			}

			void TearDown() override { AllocationTestHarness::TearDown(); }

			BT_HDR* AllocateL2capPacket(const std::vector<uint8_t> data) const {
			auto packet = AllocatePacket(data.size());
			std::copy(data.cbegin(), data.cend(), Data(packet));
			return packet;
			}

			private:
			BT_HDR* AllocatePacket(size_t packet_length) const {
			BT_HDR* packet =
			static_cast<BT_HDR*>(osi_calloc(sizeof(BT_HDR) + packet_length));
			packet->len = packet_length;
			return packet;
			}
			};

			TEST_F(A2dpStackTest, DecodePacket_ZeroLength) {
			const std::vector<uint8_t> data;
			BT_HDR* p_buf = AllocateL2capPacket(data);
			CHECK(!a2dp_vendor_ldac_decoder_decode_packet(p_buf));
			osi_free(p_buf);
			}