[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20250124040641.7431-1-imkanmodkhan@gmail.com>
Date: Fri, 24 Jan 2025 12:06:41 +0800
From: Imkanmod Khan <imkanmodkhan@...il.com>
To: stable@...r.kernel.org
Cc: patches@...ts.linux.dev,
mchehab@...nel.org,
fullwaywang@...look.com,
gregkh@...uxfoundation.org,
linux-kernel@...r.kernel.org,
tiffany.lin@...iatek.com,
andrew-ct.chen@...iatek.com,
yunfei.dong@...iatek.com,
matthias.bgg@...il.com,
linux-media@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org,
Imkanmod Khan <imkanmodkhan@...il.com>
Subject: [PATCH 6.1.y] media: mtk-vcodec: potential null pointer deference in SCP
From: Fullway Wang <fullwaywang@...look.com>
[ Upstream commit 53dbe08504442dc7ba4865c09b3bbf5fe849681b ]
The return value of devm_kzalloc() needs to be checked to avoid
NULL pointer deference. This is similar to CVE-2022-3113.
Link: https://lore.kernel.org/linux-media/PH7PR20MB5925094DAE3FD750C7E39E01BF712@PH7PR20MB5925.namprd20.prod.outlook.com
Signed-off-by: Fullway Wang <fullwaywang@...look.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@...nel.org>
[ To fix CVE: CVE-2024-40973, modified the file path from drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_scp.c
to drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c and minor conflict resolution ]
Signed-off-by: Imkanmod Khan <imkanmodkhan@...il.com>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c
index d8e66b645bd8..27f08b1d34d1 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_fw_scp.c
@@ -65,6 +65,8 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_scp_init(struct mtk_vcodec_dev *dev)
}
fw = devm_kzalloc(&dev->plat_dev->dev, sizeof(*fw), GFP_KERNEL);
+ if (!fw)
+ return ERR_PTR(-ENOMEM);
fw->type = SCP;
fw->ops = &mtk_vcodec_rproc_msg;
fw->scp = scp;
--
2.25.1
Powered by blists - more mailing lists