Linux kernel and device drivers for NXP i.MX platforms
 help / color / mirror / Atom feed
From: ming.qian@oss.nxp.com
To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com
Cc: shawnguo@kernel.org, s.hauer@pengutronix.de,
	kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com,
	eagle.zhou@nxp.com, linux-imx@nxp.com, imx@lists.linux.dev,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data
Date: Fri, 18 Apr 2025 15:08:18 +0800	[thread overview]
Message-ID: <20250418070826.141-3-ming.qian@oss.nxp.com> (raw)
In-Reply-To: <20250418070826.141-1-ming.qian@oss.nxp.com>

From: Ming Qian <ming.qian@oss.nxp.com>

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

Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder")
Signed-off-by: Ming Qian <ming.qian@oss.nxp.com>
---
v5
- Make a single patch to reset the slot data pointers when free data

 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 2f7ee5dfa93d..b2f7e9ad1885 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -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),
 			  jpeg->slot_data.desc,
 			  jpeg->slot_data.desc_handle);
+	jpeg->slot_data.desc = NULL;
+	jpeg->slot_data.desc_handle = 0;
 
 	/* free descriptor for encoder configuration phase / decoder DHT */
 	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
 			  jpeg->slot_data.cfg_desc,
 			  jpeg->slot_data.cfg_desc_handle);
+	jpeg->slot_data.cfg_desc_handle = 0;
+	jpeg->slot_data.cfg_desc = NULL;
 
 	/* free configuration stream */
 	dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM,
 			  jpeg->slot_data.cfg_stream_vaddr,
 			  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;
 }
-- 
2.43.0-rc1


  parent reply	other threads:[~2025-04-18  7:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-18  7:08 [PATCH v5 0/5] media: imx-jpeg: Fix some motion-jpeg decoding ming.qian
2025-04-18  7:08 ` [PATCH v5 1/5] media: imx-jpeg: Move mxc_jpeg_free_slot_data() ahead ming.qian
2025-04-18 12:45   ` Nicolas Dufresne
2025-04-18 15:02   ` Frank Li
2025-04-18  7:08 ` ming.qian [this message]
2025-04-18 12:49   ` [PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data Nicolas Dufresne
2025-04-21  7:39     ` Ming Qian(OSS)
2025-04-18  7:08 ` [PATCH v5 3/5] media: imx-jpeg: Cleanup after an allocation error ming.qian
2025-04-18  7:08 ` [PATCH v5 4/5] media: imx-jpeg: Change the pattern size to 128x64 ming.qian
2025-04-18  7:08 ` [PATCH v5 5/5] media: imx-jpeg: Check decoding is ongoing for motion-jpeg ming.qian
2025-04-18 12:01 ` [PATCH v5 0/5] media: imx-jpeg: Fix some motion-jpeg decoding Nicolas Dufresne
2025-04-21  7:37   ` Ming Qian(OSS)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250418070826.141-3-ming.qian@oss.nxp.com \
    --to=ming.qian@oss.nxp.com \
    --cc=eagle.zhou@nxp.com \
    --cc=festevam@gmail.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=imx@lists.linux.dev \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=mirela.rabulea@oss.nxp.com \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=xiahong.bao@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox