This is a note to let you know that I've just added the patch titled
media: imx-jpeg: Fix possible null pointer dereference
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-imx-jpeg-fix-possible-null-pointer-dereference.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit ba67bf002a6d5d0732ed9069e4882f5fc571c438
Author: Mirela Rabulea <mirela.rabulea@xxxxxxx>
Date: Mon Sep 27 20:56:32 2021 +0200
media: imx-jpeg: Fix possible null pointer dereference
[ Upstream commit 83f5f0633b156c636f5249d3c10f2a9423dd4c96 ]
Found by Coverity scan.
Signed-off-by: Mirela Rabulea <mirela.rabulea@xxxxxxx>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@xxxxxxx>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index 755138063ee61..33e7604271cdf 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -575,6 +575,10 @@ static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv)
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ if (!dst_buf || !src_buf) {
+ dev_err(dev, "No source or destination buffer.\n");
+ goto job_unlock;
+ }
jpeg_src_buf = vb2_to_mxc_buf(&src_buf->vb2_buf);
if (dec_ret & SLOT_STATUS_ENC_CONFIG_ERR) {
