media: verisilicon: rockchip: Fix leaks in init
Subsystems (3)
PATCH 1/1 media: verisilicon: rockchip: Fix leaks in init
if one of the dma_alloc_coherent in the init fucntion fails then the previously allocated ones leak.
Fix by freeing them in the error path.
--- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-)
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +55 -13
@@ -369,6 +369,7 @@ void rockchip_vpu981_av1_dec_exit(struct hantro_ctx *ctx)int rockchip_vpu981_av1_dec_init (struct hantro_ctx *ctx) { +int ret =0 ;struct hantro_dev *vpu = ctx->dev;struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
@@ -377,39 +378,54 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) av1_dec->global_model.cpu =dma_alloc_coherent (vpu->dev,GLOBAL_MODEL_SIZE , &av1_dec->global_model.dma,GFP_KERNEL ); -if (!av1_dec->global_model.cpu) -return -ENOMEM ; +if (!av1_dec->global_model.cpu) { + ret = -ENOMEM ; + goto global_model_cpu_err; + } + av1_dec->global_model.size =GLOBAL_MODEL_SIZE ; av1_dec->tile_info.cpu =dma_alloc_coherent (vpu->dev,AV1_TILE_INFO_SIZE , &av1_dec->tile_info.dma,GFP_KERNEL ); -if (!av1_dec->tile_info.cpu) -return -ENOMEM ; +if (!av1_dec->tile_info.cpu) { + ret = -ENOMEM ; + goto tile_info_cpu_err; + } + av1_dec->tile_info.size =AV1_TILE_INFO_SIZE ; av1_dec->film_grain.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct rockchip_av1_film_grain ),2048 ), &av1_dec->film_grain.dma,GFP_KERNEL ); -if (!av1_dec->film_grain.cpu) -return -ENOMEM ; +if (!av1_dec->film_grain.cpu) { + ret = -ENOMEM ; + goto film_grain_cpu_err; + } + av1_dec->film_grain.size =ALIGN (sizeof (struct rockchip_av1_film_grain ),2048 ); av1_dec->prob_tbl.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct av1cdfs ),2048 ), &av1_dec->prob_tbl.dma,GFP_KERNEL ); -if (!av1_dec->prob_tbl.cpu) -return -ENOMEM ; +if (!av1_dec->prob_tbl.cpu) { + ret = -ENOMEM ; + goto prob_tbl_cpu_err; + } + av1_dec->prob_tbl.size =ALIGN (sizeof (struct av1cdfs ),2048 ); av1_dec->prob_tbl_out.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct av1cdfs ),2048 ), &av1_dec->prob_tbl_out.dma,GFP_KERNEL ); -if (!av1_dec->prob_tbl_out.cpu) -return -ENOMEM ; +if (!av1_dec->prob_tbl_out.cpu) { + ret = -ENOMEM ; + goto prob_tbl_out_cpu_err; + } + av1_dec->prob_tbl_out.size =ALIGN (sizeof (struct av1cdfs ),2048 ); av1_dec->cdfs = &av1_dec->default_cdfs; av1_dec->cdfs_ndvc = &av1_dec->default_cdfs_ndvc;
@@ -420,11 +436,37 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx)AV1_TILE_SIZE , &av1_dec->tile_buf.dma, GFP_KERNEL); -if (!av1_dec->tile_buf.cpu) -return -ENOMEM ; +if (!av1_dec->tile_buf.cpu) { + ret = -ENOMEM ; + goto tile_buf_cpu_err; + } + av1_dec->tile_buf.size =AV1_TILE_SIZE ; -return 0 ; +return ret; + +tile_buf_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->prob_tbl_out.size, + av1_dec->prob_tbl_out.cpu, + av1_dec->prob_tbl_out.dma); +prob_tbl_out_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->prob_tbl.size, + av1_dec->prob_tbl.cpu, + av1_dec->prob_tbl.dma); +prob_tbl_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->film_grain.size, + av1_dec->film_grain.cpu, + av1_dec->film_grain.dma); +film_grain_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->tile_info.size, + av1_dec->tile_info.cpu, + av1_dec->tile_info.dma); +tile_info_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->global_model.size, + av1_dec->global_model.cpu, + av1_dec->global_model.dma); +global_model_cpu_err: +return ret; }static int rockchip_vpu981_av1_dec_prepare_run (struct hantro_ctx *ctx)
Signature · 1 line
2.43.0
Quoted 36 lines · Michail Tatas
if one of the
dma_alloc_coherentin the init fucntion fails then the previously allocated ones leak.Fix by freeing them in the error path.
Fixes 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder")Signed-off-by Michail Tatas <[email protected]>--- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-)drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +6
-2@@ -369,6 +369,7 @@ void rockchip_vpu981_av1_dec_exit(struct hantro_ctx *ctx)int rockchip_vpu981_av1_dec_init (struct hantro_ctx *ctx) { +int ret =0 ;struct hantro_dev *vpu = ctx->dev;struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;@@ -377,39 +378,54 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) av1_dec->global_model.cpu =dma_alloc_coherent (vpu->dev,GLOBAL_MODEL_SIZE , &av1_dec->global_model.dma,GFP_KERNEL ); -if (!av1_dec->global_model.cpu) -return -ENOMEM ; +if (!av1_dec->global_model.cpu) { + ret = -ENOMEM ; + goto global_model_cpu_err; + } + av1_dec->global_model.size =GLOBAL_MODEL_SIZE ;
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) · line 395
Quoted 10 lines
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +5
-2av1_dec->tile_info.cpu =dma_alloc_coherent (vpu->dev,AV1_TILE_INFO_SIZE , &av1_dec->tile_info.dma,GFP_KERNEL ); -if (!av1_dec->tile_info.cpu) -return -ENOMEM ; +if (!av1_dec->tile_info.cpu) { + ret = -ENOMEM ; + goto tile_info_cpu_err; + } +
This function is called by hantro_probe() if I am correct
there are dmam_alloc_coherent(), use dmam_alloc_coherent() will simple error handle and tear down.
Frank
Quoted 86 lines
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +44
-10av1_dec->tile_info.size =AV1_TILE_INFO_SIZE ; av1_dec->film_grain.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct rockchip_av1_film_grain ),2048 ), &av1_dec->film_grain.dma,GFP_KERNEL ); -if (!av1_dec->film_grain.cpu) -return -ENOMEM ; +if (!av1_dec->film_grain.cpu) { + ret = -ENOMEM ; + goto film_grain_cpu_err; + } + av1_dec->film_grain.size =ALIGN (sizeof (struct rockchip_av1_film_grain ),2048 ); av1_dec->prob_tbl.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct av1cdfs ),2048 ), &av1_dec->prob_tbl.dma,GFP_KERNEL ); -if (!av1_dec->prob_tbl.cpu) -return -ENOMEM ; +if (!av1_dec->prob_tbl.cpu) { + ret = -ENOMEM ; + goto prob_tbl_cpu_err; + } + av1_dec->prob_tbl.size =ALIGN (sizeof (struct av1cdfs ),2048 ); av1_dec->prob_tbl_out.cpu =dma_alloc_coherent (vpu->dev,ALIGN (sizeof (struct av1cdfs ),2048 ), &av1_dec->prob_tbl_out.dma,GFP_KERNEL ); -if (!av1_dec->prob_tbl_out.cpu) -return -ENOMEM ; +if (!av1_dec->prob_tbl_out.cpu) { + ret = -ENOMEM ; + goto prob_tbl_out_cpu_err; + } + av1_dec->prob_tbl_out.size =ALIGN (sizeof (struct av1cdfs ),2048 ); av1_dec->cdfs = &av1_dec->default_cdfs; av1_dec->cdfs_ndvc = &av1_dec->default_cdfs_ndvc;@@ -420,11 +436,37 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx)AV1_TILE_SIZE , &av1_dec->tile_buf.dma, GFP_KERNEL); -if (!av1_dec->tile_buf.cpu) -return -ENOMEM ; +if (!av1_dec->tile_buf.cpu) { + ret = -ENOMEM ; + goto tile_buf_cpu_err; + } + av1_dec->tile_buf.size =AV1_TILE_SIZE ; -return 0 ; +return ret; + +tile_buf_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->prob_tbl_out.size, + av1_dec->prob_tbl_out.cpu, + av1_dec->prob_tbl_out.dma); +prob_tbl_out_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->prob_tbl.size, + av1_dec->prob_tbl.cpu, + av1_dec->prob_tbl.dma); +prob_tbl_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->film_grain.size, + av1_dec->film_grain.cpu, + av1_dec->film_grain.dma); +film_grain_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->tile_info.size, + av1_dec->tile_info.cpu, + av1_dec->tile_info.dma); +tile_info_cpu_err: +dma_free_coherent (vpu->dev, av1_dec->global_model.size, + av1_dec->global_model.cpu, + av1_dec->global_model.dma); +global_model_cpu_err: +return ret; }static int rockchip_vpu981_av1_dec_prepare_run (struct hantro_ctx *ctx) --2.43.0
Quoted 50 lines · Frank Li
Quoted 36 lines · Michail Tatas
if one of the
dma_alloc_coherentin the init fucntion fails then the previously allocated ones leak.Fix by freeing them in the error path.
Fixes 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder")Signed-off-by Michail Tatas <[email protected]>--- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-)drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +6
-2@@ -369,6 +369,7 @@ void rockchip_vpu981_av1_dec_exit(struct hantro_ctx *ctx)int rockchip_vpu981_av1_dec_init (struct hantro_ctx *ctx) { +int ret =0 ;struct hantro_dev *vpu = ctx->dev;struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;@@ -377,39 +378,54 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) av1_dec->global_model.cpu =dma_alloc_coherent (vpu->dev,GLOBAL_MODEL_SIZE , &av1_dec->global_model.dma,GFP_KERNEL ); -if (!av1_dec->global_model.cpu) -return -ENOMEM ; +if (!av1_dec->global_model.cpu) { + ret = -ENOMEM ; + goto global_model_cpu_err; + } + av1_dec->global_model.size =GLOBAL_MODEL_SIZE ;drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) · line 395
Quoted 10 lines
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +5
-2av1_dec->tile_info.cpu =dma_alloc_coherent (vpu->dev,AV1_TILE_INFO_SIZE , &av1_dec->tile_info.dma,GFP_KERNEL ); -if (!av1_dec->tile_info.cpu) -return -ENOMEM ; +if (!av1_dec->tile_info.cpu) { + ret = -ENOMEM ; + goto tile_info_cpu_err; + } +This function is called by
hantro_probe()if I am correct
Quoted 4 lines
there are
dmam_alloc_coherent(), usedmam_alloc_coherent()will simple error handle and tear down.Frank
Hello Frank,
I did not know about the dmam* functions thanks for letting me know. I read some of the docs about them and they seem to not apply to this particular case since this code is not called from the probe function but rather the hantro_start_streaming function. Since dmam_alloc_coherent() only releases memory at device removal, it wouldn't free them when the stream ends and a new stream would re-allocate while the old buffers lingered until detach. So I think manual dma_free_coherent() error path is the correct fit here.
Best regards,
Michail
Frank Li
Reviewed-byQuoted 58 lines · Michail Tatas
Quoted 50 lines · Frank Li
Quoted 36 lines · Michail Tatas
if one of the
dma_alloc_coherentin the init fucntion fails then the previously allocated ones leak.Fix by freeing them in the error path.
Fixes 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder")Signed-off-by Michail Tatas <[email protected]>--- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-)drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +6
-2@@ -369,6 +369,7 @@ void rockchip_vpu981_av1_dec_exit(struct hantro_ctx *ctx)int rockchip_vpu981_av1_dec_init (struct hantro_ctx *ctx) { +int ret =0 ;struct hantro_dev *vpu = ctx->dev;struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;@@ -377,39 +378,54 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) av1_dec->global_model.cpu =dma_alloc_coherent (vpu->dev,GLOBAL_MODEL_SIZE , &av1_dec->global_model.dma,GFP_KERNEL ); -if (!av1_dec->global_model.cpu) -return -ENOMEM ; +if (!av1_dec->global_model.cpu) { + ret = -ENOMEM ; + goto global_model_cpu_err; + } + av1_dec->global_model.size =GLOBAL_MODEL_SIZE ;drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) · line 395
Quoted 10 lines
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +5
-2av1_dec->tile_info.cpu =dma_alloc_coherent (vpu->dev,AV1_TILE_INFO_SIZE , &av1_dec->tile_info.dma,GFP_KERNEL ); -if (!av1_dec->tile_info.cpu) -return -ENOMEM ; +if (!av1_dec->tile_info.cpu) { + ret = -ENOMEM ; + goto tile_info_cpu_err; + } +This function is called by
hantro_probe()if I am correctQuoted 4 lines
there are
dmam_alloc_coherent(), usedmam_alloc_coherent()will simple error handle and tear down.Frank
Hello Frank,
Quoted 9 lines
I did not know about the dmam* functions thanks for letting me know. I read some of the docs about them and they seem to not apply to this particular case since this code is not called from the probe function but rather the
hantro_start_streamingfunction. Sincedmam_alloc_coherent()only releases memory at device removal, it wouldn't free them when the stream ends and a new stream would re-allocate while the old buffers lingered until detach. So I think manualdma_free_coherent()error path is the correct fit here.
Okay, make sense.
Frank
Quoted 3 lines
Best regards,
Michail
Le vendredi 21 août 2026 à 10:15 -0500, Frank Li a écrit :
Quoted 69 lines · Michail Tatas
Quoted 58 lines · Frank Li
Quoted 50 lines · Michail Tatas
Quoted 36 lines
if one of the
dma_alloc_coherentin the init fucntion fails then the previously allocated ones leak.Fix by freeing them in the error path.
Fixes 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder")Signed-off-by Michail Tatas <[email protected]>--- .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-)drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +6
-2@@ -369,6 +369,7 @@ void rockchip_vpu981_av1_dec_exit(struct hantro_ctx *ctx)int rockchip_vpu981_av1_dec_init (struct hantro_ctx *ctx) { +int ret =0 ;struct hantro_dev *vpu = ctx->dev;struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;@@ -377,39 +378,54 @@ int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) av1_dec->global_model.cpu =dma_alloc_coherent (vpu->dev,GLOBAL_MODEL_SIZE , &av1_dec->global_model.dma,GFP_KERNEL ); -if (!av1_dec->global_model.cpu) -return -ENOMEM ; +if (!av1_dec->global_model.cpu) { + ret = -ENOMEM ; + goto global_model_cpu_err; + } + av1_dec->global_model.size =GLOBAL_MODEL_SIZE ;drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c int rockchip_vpu981_av1_dec_init(struct hantro_ctx *ctx) · line 395
Quoted 10 lines
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +5
-2av1_dec->tile_info.cpu =dma_alloc_coherent (vpu->dev,AV1_TILE_INFO_SIZE , &av1_dec->tile_info.dma,GFP_KERNEL ); -if (!av1_dec->tile_info.cpu) -return -ENOMEM ; +if (!av1_dec->tile_info.cpu) { + ret = -ENOMEM ; + goto tile_info_cpu_err; + } +This function is called by
hantro_probe()if I am correctQuoted 4 lines
there are
dmam_alloc_coherent(), usedmam_alloc_coherent()will simple error handle and tear down.Frank
Hello Frank,
Quoted 9 lines
I did not know about the dmam* functions thanks for letting me know. I read some of the docs about them and they seem to not apply to this particular case since this code is not called from the probe function but rather the
hantro_start_streamingfunction. Sincedmam_alloc_coherent()only releases memory at device removal, it wouldn't free them when the stream ends and a new stream would re-allocate while the old buffers lingered until detach. So I think manualdma_free_coherent()error path is the correct fit here.
Quoted 3 lines
Okay, make sense.
Reviewed-by Frank Li <[email protected]>
Applied, ty, and thanks for the review!
Quoted 11 lines
Frank
Quoted 3 lines
Best regards,
Michail_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip