Skip to content

Commit dbe5b73

Browse files
yunfei-mtkgregkh
authored andcommitted
media: mediatek: vcodec: Fix VP8 stateless decoder smatch warning
[ Upstream commit b113bc7 ] Fix a smatch static checker warning on vdec_vp8_req_if.c. Which leads to a kernel crash when fb is NULL. Fixes: 7a7ae26 ("media: mediatek: vcodec: support stateless VP8 decoding") Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 588bcce commit dbe5b73

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,18 @@ static int vdec_vp8_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
335335
src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer);
336336

337337
fb = inst->ctx->dev->vdec_pdata->get_cap_buffer(inst->ctx);
338-
dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer);
338+
if (!fb) {
339+
mtk_vdec_err(inst->ctx, "fb buffer is NULL");
340+
return -ENOMEM;
341+
}
339342

340-
y_fb_dma = fb ? (u64)fb->base_y.dma_addr : 0;
343+
dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer);
344+
y_fb_dma = fb->base_y.dma_addr;
341345
if (inst->ctx->q_data[MTK_Q_DATA_DST].fmt->num_planes == 1)
342346
c_fb_dma = y_fb_dma +
343347
inst->ctx->picinfo.buf_w * inst->ctx->picinfo.buf_h;
344348
else
345-
c_fb_dma = fb ? (u64)fb->base_c.dma_addr : 0;
349+
c_fb_dma = fb->base_c.dma_addr;
346350

347351
inst->vsi->dec.bs_dma = (u64)bs->dma_addr;
348352
inst->vsi->dec.bs_sz = bs->size;

0 commit comments

Comments
 (0)