fix coverity issues in encoder driver
Subsystems (3)
v2 cover fix coverity issues in encoder driver
two coverity issues in encoder driver, submit two changes for fix them.
changes compared with v1:
- separate into two changes.
---
Irui Wang (2):
media: mediatek: vcodec: make sure array index is in valid range
media: mediatek: vcodec: make sure pointer isn't NULL before used
.../platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 1/2 media: mediatek: vcodec: make sure array index is in valid range
CERT-C Characters and Strings:
dev->reg_base[dev->venc_pdata->core_id] evaluates to an address that could be at negative offset of an array, check core id is in valid range.
--- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +12 -4
@@ -89,16 +89,24 @@ static irqreturn_t mtk_vcodec_enc_irq_handler(int irq, void *priv)struct mtk_vcodec_ctx *ctx;unsigned long flags;void __iomem *addr; +int core_id;spin_lock_irqsave (&dev->irqlock, flags); ctx = dev->curr_ctx;spin_unlock_irqrestore (&dev->irqlock, flags); -mtk_v4l2_debug (1 ,"id=%d coreid:%d" , ctx->id, dev->venc_pdata->core_id); - addr = dev->reg_base[dev->venc_pdata->core_id] + -MTK_VENC_IRQ_ACK_OFFSET ; + core_id = dev->venc_pdata->core_id; +if (core_id <0 || core_id >=NUM_MAX_VCODEC_REG_BASE ) { +mtk_v4l2_err ("Invalid core id: %d, ctx id: %d" , + core_id, ctx->id); +return IRQ_HANDLED ; + } + +mtk_v4l2_debug (1 ,"id: %d, core id: %d" , ctx->id, core_id); + + addr = dev->reg_base[core_id] +MTK_VENC_IRQ_ACK_OFFSET ; - ctx->irq_status =readl (dev->reg_base[dev->venc_pdata->core_id] + + ctx->irq_status =readl (dev->reg_base[core_id] + (MTK_VENC_IRQ_STATUS_OFFSET ));clean_irq_status (ctx->irq_status, addr);
Signature · 1 line
2.18.0
Re: [PATCH v2, 1/2] media: mediatek: vcodec: make sure array index is in valid range
Quoted 4 lines · Irui Wang
CERT-C Characters and Strings:
dev->reg_base[dev->venc_pdata->core_id] evaluates to an address that could be at negative offset of an array, check core id is in valid range.
PATCH v2 2/2 media: mediatek: vcodec: make sure pointer isn't NULL before used
In reply to Irui WangCERT-C Expression check:
Dereferencing buf, which is known to be NULL, check buf is not NULL before used.
--- drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +1 -1
@@ -943,7 +943,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)* FIXME: This check is not needed as only active buffers * can be marked as done. */ -if (buf->state ==VB2_BUF_STATE_ACTIVE ) { +if (buf && buf->state ==VB2_BUF_STATE_ACTIVE ) {mtk_v4l2_debug (0 ,"[%d] id=%d, type=%d, %d -> VB2_BUF_STATE_QUEUED" , ctx->id, i, q->type, (int )buf->state);
Signature · 1 line
2.18.0
Yunfei Dong (董云飞)
maintainerRe: [PATCH v2, 2/2] media: mediatek: vcodec: make sure pointer isn't NULL before used
Hi Irui,
Quoted 4 lines · Irui Wang
CERT-C Expression check:
Dereferencing buf, which is known to be NULL, check buf is not NULL before used.
Whether 'dereferencing buf' is one kind of CERT-C Expression check? You can re-write commit message and subject.
CERT-C Expression check (Dereferencing buf):
Making sure the pointer is not NULL before to be used.
Best Regards,
Yunfei Dong
Quoted 22 lines
Signed-off-by Irui Wang <[email protected]>--- drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +0
-0@@ -943,7 +943,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) * FIXME: This check is not needed as only activebuffers
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +1
-1* can be marked as done. */ -if (buf->state ==VB2_BUF_STATE_ACTIVE ) { +if (buf && buf->state ==VB2_BUF_STATE_ACTIVE ) { mtk_v4l2_debug(0, "[%d] id=%d, type=%d, %d ->
VB2_BUF_STATE_QUEUED",drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +0
-0ctx->id, i, q->type, (int)buf->state);
Re: [PATCH v2, 2/2] media: mediatek: vcodec: make sure pointer isn't NULL before used
Dear Yunfei,
Thanks for your reviewing.
Quoted 8 lines · Yunfei Dong (董云飞)
Hi Irui,
Quoted 4 lines · Irui Wang
CERT-C Expression check:
Dereferencing buf, which is known to be NULL, check buf is not NULL before used.
Quoted 4 lines
Whether 'dereferencing buf' is one kind of CERT-C Expression check? You can re-write commit message and subject.
CERT-C Expression check (Dereferencing buf):
no, 'buf' is the used variable name, this coverity is 'Dereference null return value(NULL RETURNS)' .
Quoted 4 lines
Making sure the pointer is not NULL before to be used.
Best Regards,
Yunfei Dong
Thanks
Best Regards
Quoted 23 lines
Quoted 23 lines
Signed-off-by Irui Wang <[email protected]>--- drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git
a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.cb/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.cindexd65800a3b89d..db65e77bd373100644drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +0
-0@@ -943,7 +943,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) * FIXME: This check is not needed as only activebuffers
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +1
-1* can be marked as done. */ -if (buf->state ==VB2_BUF_STATE_ACTIVE ) { +if (buf && buf->state ==VB2_BUF_STATE_ACTIVE ) { mtk_v4l2_debug(0, "[%d] id=%d, type=%d, %d ->
VB2_BUF_STATE_QUEUED",drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +0
-0ctx->id, i, q->type, (int)buf->state);
Yunfei Dong (董云飞)
maintainerHi Irui,
Quoted 3 lines · Irui Wang
two coverity issues in encoder driver, submit two changes for fix them.
Maybe better:
Submit two changes to fix two kind of coverity issues in encoder driver.
Best Regards,
Yunfei Dong
Quoted 13 lines
changes compared with v1:
- separate into two changes.
---Irui Wang (2):
media: mediatek: vcodec: make sure array index is in valid range
media: mediatek: vcodec: make sure pointer isn't NULL before used.../platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 16 ++++++++++++ ---- 2 files changed, 13 insertions(+), 5 deletions(-)