diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-01-16 18:28:39 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-01-16 18:28:39 -0800 |
| commit | e941d9a1e29ae73beac5cb13e106096f04bdfb42 (patch) | |
| tree | 557a83445c28984b6f1fa7a755b8316938247190 | |
| parent | 60b94308066188813f27f7c0d20ea8442793ef03 (diff) | |
| parent | e9b45a00a3ff90001db4758f6109f10908d36bfb (diff) | |
| download | camera-kernel-android-msm-redbull-4.19-android12-qpr3.tar.gz | |
Merge android-msm-pixel-4.19-sc-v2 into android-msm-pixel-4.19-sc-qpr3android-s-qpr3-beta-3_r0.3android-s-qpr3-beta-2_r0.3android-s-qpr3-beta-1_r0.3android-12.1.0_r0.33android-12.1.0_r0.26android-msm-redbull-4.19-s-qpr3-beta-3android-msm-redbull-4.19-s-qpr3-beta-2android-msm-redbull-4.19-android12-qpr3
SBMerger: 410055097
Change-Id: I5ce75bf8cf7aa11cfd614ff9e761db6c231c5f83
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c b/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c index 4d6e4a4..c27b206 100644 --- a/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c +++ b/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c @@ -728,10 +728,11 @@ static int cam_jpeg_mgr_prepare_hw_update(void *hw_mgr_priv, } if ((packet->num_cmd_buf > 5) || !packet->num_patches || - !packet->num_io_configs) { - CAM_ERR(CAM_JPEG, "wrong number of cmd/patch info: %u %u", - packet->num_cmd_buf, - packet->num_patches); + !packet->num_io_configs || + (packet->num_io_configs > CAM_JPEG_IMAGE_MAX)) { + CAM_ERR(CAM_JPEG, "wrong number of cmd/patch info: %u %u %u", + packet->num_cmd_buf, packet->num_patches, + packet->num_io_configs); return -EINVAL; } |