2022-10-28 11:32:27

by Anastasia Belova

[permalink] [raw]
Subject: [PATCH 5.10 0/1] vdec_vp9_if: add check for NULL for vsi->frm_bufs[vsi->new_fb_idx].buf.fb in vp9_swap_frm_bufs

Null-pointer dereference was found with static analysis tools
in version 5.10. Seems this file doesn't exist since 5.18.
This file was moved to
/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_if.c.
Maybe it is necessary to create another patch for these updates.


2022-10-28 11:37:28

by Anastasia Belova

[permalink] [raw]
Subject: [PATCH 5.10 1/1] vdec_vp9_if: add check for NULL for vsi->frm_bufs[vsi->new_fb_idx].buf.fb in vp9_swap_frm_bufs

If vsi->frm_bufs[vsi->new_fb_idx].buf.fb == NULL while cleaning
fb_free_list NULL-pointer is dereferenced.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Anastasia Belova <[email protected]>
---
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
index d9880210b2ab..dea056689b48 100644
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
@@ -512,7 +512,7 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst)
* clean fb_free_list
*/
if (vsi->frm_bufs[vsi->new_fb_idx].ref_cnt == 0) {
- if (!vp9_is_sf_ref_fb(
+ if (vsi->frm_bufs[vsi->new_fb_idx].buf.fb != NULL && !vp9_is_sf_ref_fb(
inst, vsi->frm_bufs[vsi->new_fb_idx].buf.fb)) {
struct vdec_fb *fb;

--
2.30.2