diff mbox series

[SRU,J,1/1] media: mtk-vcodec: potential null pointer deference in SCP

Message ID 20241119162312.57927-2-massimiliano.pellizzer@canonical.com
State New
Headers show
Series CVE-2024-40973 | expand

Commit Message

Massimiliano Pellizzer Nov. 19, 2024, 4:23 p.m. UTC 
From: Fullway Wang <fullwaywang@outlook.com>

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@outlook.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
(backported from commit 53dbe08504442dc7ba4865c09b3bbf5fe849681b)
[mpellizzer: the file to patch went through numerous renamings;
backported the fix to the correct file; moreover solved merge conflicts
due to surrounding instructions which do not affect the patch]
CVE-2024-40973
Signed-off-by: Massimiliano Pellizzer <massimiliano.pellizzer@canonical.com>
---
 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
index d8e66b645bd84..27f08b1d34d19 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
+++ b/drivers/media/platform/mtk-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;