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

Validate request metadata before coverting to camera metadata

Browse source 
- Backport similar fix from AIDL to HIDL to protect
from malformed metadata

Bug: 256166626
Test: CTS test
Change-Id: If8f83520144824e38ed102b7468d6d5ee2e6d963
This commit is contained in:
Ravneet Dhanjal 2023-01-04 21:06:52 +00:00
parent 32488fc30d
commit 2f6f874e17
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
camera/device/3.2/default/convert.cpp
View file

@ -16,6 +16,7 @@
#define LOG_TAG "android.hardware.camera.device@3.2-convert-impl"
#include <log/log.h>
#include <system/camera_metadata.h>
#include "include/convert.h"
@ -43,6 +44,13 @@ bool convertFromHidl(const CameraMetadata &src, const camera_metadata_t** dst) {
ALOGE("%s: input CameraMetadata is corrupt!", __FUNCTION__);
return false;
}
if (validate_camera_metadata_structure((camera_metadata_t*)data, /*expected_size=*/NULL) !=
OK) {
ALOGE("%s: Failed to validate the metadata structure", __FUNCTION__);
return false;
}
*dst = (camera_metadata_t*) data;
return true;
}