From e7ba166ed8da4c6a4585583c36901dba6e5d7c90 Mon Sep 17 00:00:00 2001 From: Yu SI Date: Fri, 12 Jun 2020 17:42:16 -0700 Subject: [PATCH] msm: cvp:fix potential prop_array idx out range fix potential issue that idx of prop_array could be out of range Change-Id: Ia2d6a7332f66f518b2f8d96ed999e3963f1b9284 Signed-off-by: Yu SI --- drivers/media/platform/msm/cvp/msm_cvp.c | 2 +- include/uapi/media/msm_cvp_private.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/msm/cvp/msm_cvp.c b/drivers/media/platform/msm/cvp/msm_cvp.c index 15126f391118..4f8706e63b69 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp.c +++ b/drivers/media/platform/msm/cvp/msm_cvp.c @@ -1125,7 +1125,7 @@ static int msm_cvp_set_sysprop(struct msm_cvp_inst *inst, return -EINVAL; } - if (props->prop_num >= MAX_KMD_PROP_NUM) { + if (props->prop_num >= MAX_KMD_PROP_NUM_PER_PACKET) { dprintk(CVP_ERR, "Too many properties %d to set\n", props->prop_num); return -E2BIG; diff --git a/include/uapi/media/msm_cvp_private.h b/include/uapi/media/msm_cvp_private.h index 68c657ad283a..90046d9eb438 100644 --- a/include/uapi/media/msm_cvp_private.h +++ b/include/uapi/media/msm_cvp_private.h @@ -149,7 +149,8 @@ struct cvp_kmd_hfi_packet { #define CVP_KMD_PROP_PWR_DDR_OP 0x1C #define CVP_KMD_PROP_PWR_SYSCACHE_OP 0x1D -#define MAX_KMD_PROP_NUM (CVP_KMD_PROP_PWR_SYSCACHE_OP + 1) +#define MAX_KMD_PROP_NUM_PER_PACKET 8 +#define MAX_KMD_PROP_TYPE (CVP_KMD_PROP_PWR_SYSCACHE_OP + 1) struct cvp_kmd_sys_property { __u32 prop_type;