mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: venus: dec: Handle the case where find_format fails

Browse Source 
commit 06a2da340f upstream.

Debugging the decoder on msm8916 I noticed the vdec probe was crashing if
the fmt pointer was NULL.

A similar fix from Colin Ian King found by Coverity was implemented for the
encoder. Implement the same fix on the decoder.

Fixes: 7472c1c691 ("[media] media: venus: vdec: add video decoder files")
Cc: stable@vger.kernel.org  # v4.13+
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bryan O'Donoghue
2022-07-26 04:14:54 +02:00
committed by Greg Kroah-Hartman
parent bce5808fc9
commit ab6aaa8210
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/qcom/venus/vdec.c
View File

@@ -158,6 +158,8 @@ vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
else else
return NULL; return NULL;
fmt = find_format(inst, pixmp->pixelformat, f->type); fmt = find_format(inst, pixmp->pixelformat, f->type);
if (!fmt)
return NULL;
} }
pixmp->width = clamp(pixmp->width, frame_width_min(inst), pixmp->width = clamp(pixmp->width, frame_width_min(inst),