commit 554e4897e7f002893b251d99fc393a83363b7110
author Eino-Ville Talvala <etalvala@google.com> Thu Apr 30 01:06:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 30 01:06:53 2020 +0000
tree 7996c5d50db5e6ae17530f55072495c0b70e7d33
parent 2e952136d1c496570ef90f5eeca1edc8d7603531
parent fdb7e3c281d700d23f1d02cc94939e3500e1af2f

Merge "Camera: Validate face count in received metadata" into rvc-dev am: fdb7e3c281

Change-Id: Ibd4b8da23d23e924d0ef04455bc2d884115dc68e

camera/ICameraClient.cpp

diff --git a/camera/ICameraClient.cpp b/camera/ICameraClient.cpp
index 8620f36..487b8b0 100644
--- a/camera/ICameraClient.cpp
+++ b/camera/ICameraClient.cpp
@@ -143,6 +143,11 @@
             if (data.dataAvail() > 0) {
                 metadata = new camera_frame_metadata_t;
                 metadata->number_of_faces = data.readInt32();
+                if (metadata->number_of_faces <= 0 ||
+                        metadata->number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {
+                    ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata->number_of_faces);
+                    return BAD_VALUE;
+                }
                 metadata->faces = (camera_face_t *) data.readInplace(
                         sizeof(camera_face_t) * metadata->number_of_faces);
             }