Skip to content

Commit c6b9f97

Browse files
yunfei-mtkgregkh
authored andcommitted
media: mediatek: vcodec: Fix H264 stateless decoder smatch warning
[ Upstream commit 7878d3a ] Fix a smatch static checker warning on vdec_h264_req_if.c. Which leads to a kernel crash when fb is NULL. Fixes: 06fa5f7 ("media: mtk-vcodec: vdec: support stateless H.264 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 dbe5b73 commit c6b9f97

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,16 @@ static int vdec_h264_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
347347
return vpu_dec_reset(vpu);
348348

349349
fb = inst->ctx->dev->vdec_pdata->get_cap_buffer(inst->ctx);
350+
if (!fb) {
351+
mtk_vdec_err(inst->ctx, "fb buffer is NULL");
352+
return -ENOMEM;
353+
}
354+
350355
src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer);
351356
dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer);
352357

353-
y_fb_dma = fb ? (u64)fb->base_y.dma_addr : 0;
354-
c_fb_dma = fb ? (u64)fb->base_c.dma_addr : 0;
358+
y_fb_dma = fb->base_y.dma_addr;
359+
c_fb_dma = fb->base_c.dma_addr;
355360

356361
mtk_vdec_debug(inst->ctx, "+ [%d] FB y_dma=%llx c_dma=%llx va=%p",
357362
inst->num_nalu, y_fb_dma, c_fb_dma, fb);

0 commit comments

Comments
 (0)