media: imx-jpeg: fix a bug of accessing array out of bounds
authorMing Qian <ming.qian@nxp.com>
Mon, 7 Feb 2022 06:28:43 +0000 (14:28 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:24:01 +0000 (14:24 +0200)
[ Upstream commit 97558d170a1236280407e8d29a7d095d2c2ed554 ]

When error occurs in parsing jpeg, the slot isn't acquired yet, it may
be the default value MXC_MAX_SLOTS.
If the driver access the slot using the incorrect slot number, it will
access array out of bounds.
The result is the driver will change num_domains, which follows
slot_data in struct mxc_jpeg_dev.
Then the driver won't detach the pm domain at rmmod, which will lead to
kernel panic when trying to insmod again.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
Reviewed-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/imx-jpeg/mxc-jpeg.c

index 637d73f5f4a27d074e86a59919f20b2f0714c26d..37905547466bde49b4b2de5646723b40a0fbcce1 100644 (file)
@@ -932,7 +932,6 @@ static void mxc_jpeg_device_run(void *priv)
                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);
                v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
                v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);