media: imx-jpeg: Prevent decoding NV12M jpegs into single-planar buffers

If the application queues an NV12M jpeg as output buffer, but then
queues a single planar capture buffer, the kernel will crash with
"Unable to handle kernel NULL pointer dereference" in mxc_jpeg_addrs,
prevent this by finishing the job with error.

Signed-off-by: Mirela Rabulea <mirela.rabulea@oss.nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index 7c0366f..fed7624 100644 (file)
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -947,6 +947,12 @@ static void mxc_jpeg_device_run(void *priv)
        v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
 
        jpeg_src_buf = vb2_to_mxc_buf(&src_buf->vb2_buf);
+       if (q_data_cap->fmt->colplanes != dst_buf->vb2_buf.num_planes) {
+               dev_err(dev, "Capture format %s has %d planes, but capture buffer has %d planes\n",
+                       q_data_cap->fmt->name, q_data_cap->fmt->colplanes,
+                       dst_buf->vb2_buf.num_planes);
+               jpeg_src_buf->jpeg_parse_error = true;
+       }
        if (jpeg_src_buf->jpeg_parse_error) {
                jpeg->slot_data[ctx->slot].used = false;
                v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);