Merge "Add additional bounds checks to NNAPI FMQ deserialize utility functions" into tm-qpr-dev (a596f9f1) · Commits · e / os / android_hardware_interfaces

neuralnetworks/1.2/utils/src/BurstUtils.cpp

+33 −23

Original line number	Diff line number	Diff line
		@@ -190,12 +190,13 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		size_t index = 0;

		// validate packet information
		if (data.size() == 0 \|\| data[index].getDiscriminator() != discriminator::packetInformation) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::packetInformation) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage packet information
		const FmqRequestDatum::PacketInformation& packetInfo = data[index].packetInformation();
		const FmqRequestDatum::PacketInformation& packetInfo = data.at(index).packetInformation();
		index++;
		const uint32_t packetSize = packetInfo.packetSize;
		const uint32_t numberOfInputOperands = packetInfo.numberOfInputOperands;
		@@ -212,13 +213,14 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		inputs.reserve(numberOfInputOperands);
		for (size_t operand = 0; operand < numberOfInputOperands; ++operand) {
		// validate input operand information
		if (data[index].getDiscriminator() != discriminator::inputOperandInformation) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::inputOperandInformation) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage operand information
		const FmqRequestDatum::OperandInformation& operandInfo =
		data[index].inputOperandInformation();
		data.at(index).inputOperandInformation();
		index++;
		const bool hasNoValue = operandInfo.hasNoValue;
		const V1_0::DataLocation location = operandInfo.location;
		@@ -229,12 +231,13 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		dimensions.reserve(numberOfDimensions);
		for (size_t i = 0; i < numberOfDimensions; ++i) {
		// validate dimension
		if (data[index].getDiscriminator() != discriminator::inputOperandDimensionValue) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::inputOperandDimensionValue) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage dimension
		const uint32_t dimension = data[index].inputOperandDimensionValue();
		const uint32_t dimension = data.at(index).inputOperandDimensionValue();
		index++;

		// store result
		@@ -251,13 +254,14 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		outputs.reserve(numberOfOutputOperands);
		for (size_t operand = 0; operand < numberOfOutputOperands; ++operand) {
		// validate output operand information
		if (data[index].getDiscriminator() != discriminator::outputOperandInformation) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::outputOperandInformation) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage operand information
		const FmqRequestDatum::OperandInformation& operandInfo =
		data[index].outputOperandInformation();
		data.at(index).outputOperandInformation();
		index++;
		const bool hasNoValue = operandInfo.hasNoValue;
		const V1_0::DataLocation location = operandInfo.location;
		@@ -268,12 +272,13 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		dimensions.reserve(numberOfDimensions);
		for (size_t i = 0; i < numberOfDimensions; ++i) {
		// validate dimension
		if (data[index].getDiscriminator() != discriminator::outputOperandDimensionValue) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::outputOperandDimensionValue) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage dimension
		const uint32_t dimension = data[index].outputOperandDimensionValue();
		const uint32_t dimension = data.at(index).outputOperandDimensionValue();
		index++;

		// store result
		@@ -290,12 +295,13 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		slots.reserve(numberOfPools);
		for (size_t pool = 0; pool < numberOfPools; ++pool) {
		// validate input operand information
		if (data[index].getDiscriminator() != discriminator::poolIdentifier) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::poolIdentifier) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage operand information
		const int32_t poolId = data[index].poolIdentifier();
		const int32_t poolId = data.at(index).poolIdentifier();
		index++;

		// store result
		@@ -303,17 +309,17 @@ nn::Result<std::tuple<V1_0::Request, std::vector<int32_t>, V1_2::MeasureTiming>>
		}

		// validate measureTiming
		if (data[index].getDiscriminator() != discriminator::measureTiming) {
		if (index >= data.size() \|\| data.at(index).getDiscriminator() != discriminator::measureTiming) {
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// unpackage measureTiming
		const V1_2::MeasureTiming measure = data[index].measureTiming();
		const V1_2::MeasureTiming measure = data.at(index).measureTiming();
		index++;

		// validate packet information
		if (index != packetSize) {
		return NN_ERROR() << "FMQ Result packet ill-formed";
		return NN_ERROR() << "FMQ Request packet ill-formed";
		}

		// return request
		@@ -328,12 +334,13 @@ nn::Result<std::tuple<V1_0::ErrorStatus, std::vector<V1_2::OutputShape>, V1_2::T
		size_t index = 0;

		// validate packet information
		if (data.size() == 0 \|\| data[index].getDiscriminator() != discriminator::packetInformation) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::packetInformation) {
		return NN_ERROR() << "FMQ Result packet ill-formed";
		}

		// unpackage packet information
		const FmqResultDatum::PacketInformation& packetInfo = data[index].packetInformation();
		const FmqResultDatum::PacketInformation& packetInfo = data.at(index).packetInformation();
		index++;
		const uint32_t packetSize = packetInfo.packetSize;
		const V1_0::ErrorStatus errorStatus = packetInfo.errorStatus;
		@@ -349,12 +356,13 @@ nn::Result<std::tuple<V1_0::ErrorStatus, std::vector<V1_2::OutputShape>, V1_2::T
		outputShapes.reserve(numberOfOperands);
		for (size_t operand = 0; operand < numberOfOperands; ++operand) {
		// validate operand information
		if (data[index].getDiscriminator() != discriminator::operandInformation) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::operandInformation) {
		return NN_ERROR() << "FMQ Result packet ill-formed";
		}

		// unpackage operand information
		const FmqResultDatum::OperandInformation& operandInfo = data[index].operandInformation();
		const FmqResultDatum::OperandInformation& operandInfo = data.at(index).operandInformation();
		index++;
		const bool isSufficient = operandInfo.isSufficient;
		const uint32_t numberOfDimensions = operandInfo.numberOfDimensions;
		@@ -364,12 +372,13 @@ nn::Result<std::tuple<V1_0::ErrorStatus, std::vector<V1_2::OutputShape>, V1_2::T
		dimensions.reserve(numberOfDimensions);
		for (size_t i = 0; i < numberOfDimensions; ++i) {
		// validate dimension
		if (data[index].getDiscriminator() != discriminator::operandDimensionValue) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::operandDimensionValue) {
		return NN_ERROR() << "FMQ Result packet ill-formed";
		}

		// unpackage dimension
		const uint32_t dimension = data[index].operandDimensionValue();
		const uint32_t dimension = data.at(index).operandDimensionValue();
		index++;

		// store result
		@@ -381,12 +390,13 @@ nn::Result<std::tuple<V1_0::ErrorStatus, std::vector<V1_2::OutputShape>, V1_2::T
		}

		// validate execution timing
		if (data[index].getDiscriminator() != discriminator::executionTiming) {
		if (index >= data.size() \|\|
		data.at(index).getDiscriminator() != discriminator::executionTiming) {
		return NN_ERROR() << "FMQ Result packet ill-formed";
		}

		// unpackage execution timing
		const V1_2::Timing timing = data[index].executionTiming();
		const V1_2::Timing timing = data.at(index).executionTiming();
		index++;

		// validate packet information