samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: jpeg: Ensure in/out map entries are within allowed range" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-09-30 17:54:02 -07:00
committed by Gerrit - the friendly Code Review server
parent 9cbace3d87 b281d0d19c
commit ad1e732da4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c
View File

@@ -949,11 +949,13 @@ static int cam_jpeg_mgr_prepare_hw_update(void *hw_mgr_priv,
return rc; return rc;
} }
if ((packet->num_cmd_buf > CAM_JPEG_MAX_NUM_CMD_BUFFS) || !packet->num_patches || if ((packet->num_cmd_buf > CAM_JPEG_MAX_NUM_CMD_BUFFS) ||
!packet->num_io_configs) { !packet->num_patches || !packet->num_io_configs ||
CAM_ERR(CAM_JPEG, "wrong number of cmd/patch info: %u %u", (packet->num_io_configs > CAM_JPEG_IMAGE_MAX)) {
packet->num_cmd_buf, CAM_ERR(CAM_JPEG,
packet->num_patches); "wrong number of cmd/patch/io_configs info: %u %u %u",
packet->num_cmd_buf, packet->num_patches,
packet->num_io_configs);
return -EINVAL; return -EINVAL;
} }

2
include/uapi/camera/media/cam_jpeg.h
View File

@@ -36,6 +36,8 @@
#define CAM_JPEG_DMA_OUTPUT_IMAGE 0x1 #define CAM_JPEG_DMA_OUTPUT_IMAGE 0x1
#define CAM_JPEG_DMA_IO_IMAGES_MAX 0x2 #define CAM_JPEG_DMA_IO_IMAGES_MAX 0x2
#define CAM_JPEG_IMAGE_MAX 0x2
/*JPEG Command Buffer Metadata types*/ /*JPEG Command Buffer Metadata types*/
#define CAM_JPEG_ENC_PACKET_CONFIG_DATA 0x00 #define CAM_JPEG_ENC_PACKET_CONFIG_DATA 0x00
#define CAM_JPEG_DMA_PACKET_PLANE0_CONFIG_DATA 0x01 #define CAM_JPEG_DMA_PACKET_PLANE0_CONFIG_DATA 0x01