diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-12 23:16:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-12 23:16:30 +0000 |
| commit | 8fc349415feaba6e31c9e99303fdf7d578794613 (patch) | |
| tree | 2ff13d61206888296d3ec14bc1ac21e814695d85 | |
| parent | 81f767f6a2ebb709fb3a94f15d0c7205c49742ca (diff) | |
| parent | e045d9f873f2232e18b5a56db180af409b19b614 (diff) | |
| download | gchips-aml_adb_331314020.tar.gz | |
Snap for 9054696 from e045d9f873f2232e18b5a56db180af409b19b614 to mainline-adbd-releaseaml_adb_331610000aml_adb_331314020aml_adb_331113120
Change-Id: Icc2791651dd7a018cb9ae19746ff679723b57163
| -rw-r--r-- | gralloc4/src/hidl_common/Allocator.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gralloc4/src/hidl_common/Allocator.cpp b/gralloc4/src/hidl_common/Allocator.cpp index 6ca758a..3b8e62a 100644 --- a/gralloc4/src/hidl_common/Allocator.cpp +++ b/gralloc4/src/hidl_common/Allocator.cpp @@ -77,7 +77,17 @@ void allocate(const buffer_descriptor_t &bufferDescriptor, uint32_t count, IAllo auto hnd = const_cast<private_handle_t *>(reinterpret_cast<const private_handle_t *>(tmpBuffer)); hnd->imapper_version = HIDL_MAPPER_VERSION_SCALED; + // 4k is rougly 7.9 MB with one byte per pixel. We are + // assuming that the reserved region might be needed for + // dynamic HDR and that represents the largest size. + uint64_t max_reserved_region_size = 8ull * 1024 * 1024; hnd->reserved_region_size = bufferDescriptor.reserved_size; + if (hnd->reserved_region_size > max_reserved_region_size) { + MALI_GRALLOC_LOGE("%s, Requested reserved region size (%" PRIu64 ") is larger than allowed (%" PRIu64 ")", + __func__, hnd->reserved_region_size, max_reserved_region_size); + error = Error::BAD_VALUE; + break; + } hnd->attr_size = mapper::common::shared_metadata_size() + hnd->reserved_region_size; if (hnd->get_usage() & GRALLOC_USAGE_ROIINFO) |