tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix use-after-free crash in VtsHalNeuralnetworksTargetTest."

Browse source
This commit is contained in:
Treehugger Robot 2021-08-27 18:48:44 +00:00 committed by Gerrit Code Review
commit 50a0c3ae3f
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
neuralnetworks/aidl/vts/functional/Utils.cpp
View file

@ -153,26 +153,19 @@ void TestBlobAHWB::initialize(uint32_t size) {
.stride = size,
};
ASSERT_EQ(AHardwareBuffer_allocate(&desc, &mAhwb), 0);
ASSERT_NE(mAhwb, nullptr);
AHardwareBuffer* ahwb = nullptr;
ASSERT_EQ(AHardwareBuffer_allocate(&desc, &ahwb), 0);
ASSERT_NE(ahwb, nullptr);
const auto sharedMemory =
nn::createSharedMemoryFromAHWB(mAhwb, /*takeOwnership=*/false).value();
mMapping = nn::map(sharedMemory).value();
mMemory = nn::createSharedMemoryFromAHWB(ahwb, /*takeOwnership=*/true).value();
mMapping = nn::map(mMemory).value();
mPtr = static_cast<uint8_t*>(std::get<void*>(mMapping.pointer));
CHECK_NE(mPtr, nullptr);
mAidlMemory = utils::convert(sharedMemory).value();
mAidlMemory = utils::convert(mMemory).value();
mIsValid = true;
}
TestBlobAHWB::~TestBlobAHWB() {
if (mAhwb) {
AHardwareBuffer_unlock(mAhwb, nullptr);
AHardwareBuffer_release(mAhwb);
}
}
std::string gtestCompliantName(std::string name) {
// gtest test names must only contain alphanumeric characters
std::replace_if(

3
neuralnetworks/aidl/vts/functional/Utils.h
View file

@ -102,11 +102,10 @@ class TestBlobAHWB : public TestMemoryBase {
// The constructor calls initialize, which constructs the memory resources. This is a
// workaround that gtest macros cannot be used directly in a constructor.
TestBlobAHWB(uint32_t size) { initialize(size); }
~TestBlobAHWB();
private:
void initialize(uint32_t size);
AHardwareBuffer* mAhwb = nullptr;
nn::SharedMemory mMemory;
nn::Mapping mMapping;
};