| From 8dc16a2aefad617aa4b221f9948d01fd921d5914 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 9 Jul 2021 14:30:25 +0200 |
| Subject: media: venus: venc: Fix potential null pointer dereference on pointer |
| fmt |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 09ea9719a423fc675d40dd05407165e161ea0c48 ] |
| |
| Currently the call to find_format can potentially return a NULL to |
| fmt and the nullpointer is later dereferenced on the assignment of |
| pixmp->num_planes = fmt->num_planes. Fix this by adding a NULL pointer |
| check and returning NULL for the failure case. |
| |
| Addresses-Coverity: ("Dereference null return") |
| |
| Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/qcom/venus/venc.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c |
| index 8dd49d4f124c..1d62e38065d6 100644 |
| --- a/drivers/media/platform/qcom/venus/venc.c |
| +++ b/drivers/media/platform/qcom/venus/venc.c |
| @@ -183,6 +183,8 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) |
| else |
| return NULL; |
| fmt = find_format(inst, pixmp->pixelformat, f->type); |
| + if (!fmt) |
| + return NULL; |
| } |
| |
| pixmp->width = clamp(pixmp->width, frame_width_min(inst), |
| -- |
| 2.30.2 |
| |