media: mediatek: encoder: memset encoder structure data
Subsystems (3)
PATCH 1/1 media: mediatek: encoder: memset encoder structure data
Utilized memset to set all bytes of encoder structure to zero, this prevents any undefined behavior due to uninitialized use.
--- .../media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +5 -0
@@ -886,6 +886,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)return 0 ; } +memset (¶m,0 ,sizeof (param));mtk_venc_set_param (ctx, ¶m); ret =venc_if_set_param (ctx,VENC_SET_PARAM_ENC , ¶m);if (ret) {
@@ -1021,12 +1022,14 @@ static int mtk_venc_encode_header(void *priv)struct mtk_vcodec_mem bs_buf;struct venc_done_result enc_result; +memset (&enc_result,0 ,sizeof (enc_result)); dst_buf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx);if (!dst_buf) {mtk_v4l2_venc_dbg (1 , ctx,"No dst buffer" );return -EINVAL ; } +memset (&bs_buf,0 ,sizeof (bs_buf)); bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length;
@@ -1143,6 +1146,7 @@ static void mtk_venc_worker(struct work_struct *work)struct venc_done_result enc_result;int ret, i; +memset (&enc_result,0 ,sizeof (enc_result));/* check dst_buf, dst_buf may be removed in device_run * to stored encdoe header so we need check dst_buf and * call job_finish here to prevent recursion
@@ -1175,6 +1179,7 @@ static void mtk_venc_worker(struct work_struct *work) frm_buf.fb_addr[i].size = (size_t )src_buf->vb2_buf.planes[i].length; } +memset (&bs_buf,0 ,sizeof (bs_buf)); bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length;
Signature · 1 line
2.46.0
AngeloGioacchino Del Regno
maintainerIl 15/07/25 10:15, Irui Wang ha scritto:
Quoted 4 lines
Utilized memset to set all bytes of encoder structure to zero, this prevents any undefined behavior due to uninitialized use.
Signed-off-by Irui Wang <[email protected]>
This commit needs a Fixes tag, as you're fixing something important here.
Also, please clarify what is this undefined behavior that you've seen and what problem are you trying to resolve by zeroing all those mem locations.
There's also more feedback, check below...
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) · line 889
Quoted 13 lines
--- .../media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-0@@ -886,6 +886,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)return 0 ; } +memset (¶m,0 ,sizeof (param));
Have you considered doing, instead...
struct venc_enc_param param = { 0 }; ?
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static int mtk_venc_encode_header(void *priv) · line 1023
Quoted 6 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0mtk_venc_set_param (ctx, ¶m); ret =venc_if_set_param (ctx,VENC_SET_PARAM_ENC , ¶m);if (ret) {@@ -1021,12 +1022,14 @@ static int mtk_venc_encode_header(void *priv)struct mtk_vcodec_mem bs_buf;struct venc_done_result enc_result;
struct venc_done_result enc_result = { 0 };
Quoted 13 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2
-0+memset (&enc_result,0 ,sizeof (enc_result)); dst_buf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx);if (!dst_buf) {mtk_v4l2_venc_dbg (1 , ctx,"No dst buffer" );return -EINVAL ; } +memset (&bs_buf,0 ,sizeof (bs_buf)); bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length;
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static void mtk_venc_worker(struct work_struct *work) · line 1149
Quoted 4 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-0@@ -1143,6 +1146,7 @@ static void mtk_venc_worker(struct work_struct *work)struct venc_done_result enc_result;int ret, i; +memset (&enc_result,0 ,sizeof (enc_result));
You should probably move this to before the first usage, instead.
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static void mtk_venc_worker(struct work_struct *work) · line 1182
Quoted 8 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-0/* check dst_buf, dst_buf may be removed in device_run * to stored encdoe header so we need check dst_buf and * call job_finish here to prevent recursion @@ -1175,6 +1179,7 @@ static void mtk_venc_worker(struct work_struct *work) frm_buf.fb_addr[i].size = (size_t )src_buf->vb2_buf.planes[i].length; } +memset (&bs_buf,0 ,sizeof (bs_buf));
here it's fine to use memset, as there are multiple ways out before actually using bs_buf.
Cheers,
Angelo
Quoted 3 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 ); bs_buf.size = (size_t )dst_buf->vb2_buf.planes[0 ].length;
Dear Angelo,
Thanks for your reviewing.
Quoted 10 lines · AngeloGioacchino Del Regno
External email : Please do not click links or open attachments until you have verified the sender or the content.
Il 15/07/25 10:15, Irui Wang ha scritto:
Quoted 4 lines
Utilized memset to set all bytes of encoder structure to zero, this prevents any undefined behavior due to uninitialized use.
Signed-off-by Irui Wang <[email protected]>
Quoted 7 lines
This commit needs a Fixes tag, as you're fixing something important here.
Also, please clarify what is this undefined behavior that you've seen and
what problem are you trying to resolve by zeroing all those mem locations.
OK, fix it in next patch.
Quoted 21 lines
There's also more feedback, check below...
Quoted 18 lines
--- .../media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c | 5 +++++ 1 file changed, 5 insertions(+)diff --git
a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.cb/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.cindexa01dc25a7699..ecac1aec7215100644
---a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c
+++b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.cdrivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -886,6 +886,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) return 0; }
Quoted 5 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) · line 889
Quoted 1 line
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-0+memset (¶m,0 ,sizeof (param));Have you considered doing, instead...
struct
venc_enc_paramparam = { 0 }; ?
OK, fix it in next patch.
Quoted 29 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static int mtk_venc_encode_header(void · line 1024
Quoted 8 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0mtk_venc_set_param (ctx, ¶m); ret =venc_if_set_param (ctx,VENC_SET_PARAM_ENC , ¶m);if (ret) {drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -1021,12 +1022,14 @@ static int mtk_venc_encode_header(void *priv)struct mtk_vcodec_mem bs_buf;struct venc_done_result enc_result;struct venc_done_result enc_result = { 0 };Quoted 18 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +2
-0+memset (&enc_result,0 ,sizeof (enc_result)); dst_buf =v4l2_m2m_dst_buf_remove (ctx->m2m_ctx);if (!dst_buf) {mtk_v4l2_venc_dbg (1 , ctx,"No dst buffer" );return -EINVAL ; } +memset (&bs_buf,0 ,sizeof (bs_buf)); bs_buf.va =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); bs_buf.dma_addr =vb2_dma_contig_plane_dma_addr (&dst_buf- >vb2_buf, 0);bs_buf.size = (size_t)dst_buf->vb2_buf.planes[0].length;drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0@@ -1143,6 +1146,7 @@ static void mtk_venc_worker(struct work_struct *work)struct venc_done_result enc_result;int ret, i;
Quoted 3 lines
Review static void mtk_venc_worker(struct · line 1150
Quoted 1 line
(quoted diff) +1
-0+ memset(&enc_result, 0, sizeof(enc_result));You should probably move this to before the first usage, instead.
OK, fix it in next patch.
Quoted 8 lines
Quoted 8 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0
-0/* check dst_buf, dst_buf may be removed in device_run * to stored encdoe header so we need check dst_buf and * call
job_finishhere to prevent recursion(quoted diff) +0
-0@@ -1175,6 +1179,7 @@ static void mtk_venc_worker(struct work_struct *work) frm_buf.fb_addr[i].size = (size_t)src_buf-
Quoted 7 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c static int mtk_venc_encode_header(void *priv) · line 1032
Quoted 3 lines
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +1
-0>vb2_buf.planes[i].length; } +memset (&bs_buf,0 ,sizeof (bs_buf));here it's fine to use memset, as there are multiple ways out before actually using
bs_buf.
We will remove the bs_buf memset, because the bs_buf's variables are set(va/dma_add/size) after definition.
Thanks!
Quoted 10 lines
Cheers,
AngeloQuoted 4 lines
(quoted diff) +0
-0bs_buf.va = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);bs_buf.dma_addr = vb2_dma_contig_plane_dma_addr(&dst_buf-
Quoted 1 line
vb2_buf, 0);bs_buf.size = (size_t)dst_buf->vb2_buf.planes[0].length;