samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: imx-jpeg: Reset slot data pointers when freed

Browse Source 
commit faa8051b128f4b34277ea8a026d02d83826f8122 upstream.

Ensure that the slot data pointers are reset to NULL and handles are
set to 0 after freeing the coherent memory. This makes he function
mxc_jpeg_alloc_slot_data() and mxc_jpeg_free_slot_data() safe to be
called multiple times.

Fixes: 2db16c6ed7 ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder")
Cc: stable@vger.kernel.org
Signed-off-by: Ming Qian <ming.qian@oss.nxp.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Qian
2025-04-21 16:12:53 +08:00
committed by Greg Kroah-Hartman
parent 683a1db680
commit 20a6db0ef3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
View File

@@ -758,16 +758,22 @@ static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg)
dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
jpeg->slot_data.desc, jpeg->slot_data.desc,
jpeg->slot_data.desc_handle); jpeg->slot_data.desc_handle);
jpeg->slot_data.desc = NULL;
jpeg->slot_data.desc_handle = 0;
/* free descriptor for encoder configuration phase / decoder DHT */ /* free descriptor for encoder configuration phase / decoder DHT */
dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
jpeg->slot_data.cfg_desc, jpeg->slot_data.cfg_desc,
jpeg->slot_data.cfg_desc_handle); jpeg->slot_data.cfg_desc_handle);
jpeg->slot_data.cfg_desc_handle = 0;
jpeg->slot_data.cfg_desc = NULL;
/* free configuration stream */ /* free configuration stream */
dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM, dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM,
jpeg->slot_data.cfg_stream_vaddr, jpeg->slot_data.cfg_stream_vaddr,
jpeg->slot_data.cfg_stream_handle); jpeg->slot_data.cfg_stream_handle);
jpeg->slot_data.cfg_stream_vaddr = NULL;
jpeg->slot_data.cfg_stream_handle = 0;
jpeg->slot_data.used = false; jpeg->slot_data.used = false;
} }