Commit a519e21e authored by Zilin Guan's avatar Zilin Guan Committed by Hans Verkuil
Browse files

media: chips-media: wave5: Fix memory leak on codec_info allocation failure 



In wave5_vpu_open_enc() and wave5_vpu_open_dec(), a vpu instance is
allocated via kzalloc(). If the subsequent allocation for inst->codec_info
fails, the functions return -ENOMEM without freeing the previously
allocated instance, causing a memory leak.

Fix this by calling kfree() on the instance in this error path to ensure
it is properly released.

Fixes: 9707a625 ("media: chips-media: wave5: Add the v4l2 layer")
Signed-off-by: default avatarZilin Guan <zilin@seu.edu.cn>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent a176ac5e

drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c

+3 −1
Original line number Diff line number Diff line
@@ -1835,8 +1835,10 @@ static int wave5_vpu_open_dec(struct file *filp) 
	INIT_LIST_HEAD(&inst->avail_src_bufs);



	inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);

	if (!inst->codec_info)

	if (!inst->codec_info) {

		kfree(inst);

		return -ENOMEM;

	}



	v4l2_fh_init(&inst->v4l2_fh, vdev);

	v4l2_fh_add(&inst->v4l2_fh, filp);

drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c

+3 −1
Original line number Diff line number Diff line
@@ -1581,8 +1581,10 @@ static int wave5_vpu_open_enc(struct file *filp) 
	inst->ops = &wave5_vpu_enc_inst_ops;



	inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL);

	if (!inst->codec_info)

	if (!inst->codec_info) {

		kfree(inst);

		return -ENOMEM;

	}



	v4l2_fh_init(&inst->v4l2_fh, vdev);

	v4l2_fh_add(&inst->v4l2_fh, filp);