From 213e49cfe754d9a89217dbab75ecb0b70a879251 Mon Sep 17 00:00:00 2001 From: Gaviraju Doddabettahalli Bettegowda Date: Thu, 20 Mar 2025 19:35:37 +0530 Subject: [PATCH] FROMGIT: media: venus: hfi_parser: add check to avoid out of bound access There is a possibility that init_codecs is invoked multiple times during manipulated payload from video firmware. In such case, if codecs_count can get incremented to value more than MAX_CODEC_NUM, there can be OOB access. Reset the count so that it always starts from beginning. Signed-off-by: Vikash Garodia (cherry picked from commit 172bf5a9ef70a399bb227809db78442dc01d9e48 https://gitlab.freedesktop.org/linux-media/media-committers.git master) Change-Id: I6216e773af65082e4775b415789ffd549e0bed2d Signed-off-by: Gaviraju Doddabettahalli Bettegowda --- drivers/media/platform/qcom/venus/hfi_parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c index 3df241dc3a11..1425c69d9006 100644 --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -19,6 +19,8 @@ static void init_codecs(struct venus_core *core) struct hfi_plat_caps *caps = core->caps, *cap; unsigned long bit; + core->codecs_count = 0; + if (hweight_long(core->dec_codecs) + hweight_long(core->enc_codecs) > MAX_CODEC_NUM) return;