summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Qian <ming.qian@oss.nxp.com>2025-04-21 16:12:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-06 10:57:57 +0200
commitb89ff9cf37ff59399f850d5f7781ef78fc37679f (patch)
tree292b1f2d44789ff76723a367354fd0c7a947ee53
parent57fd729cb04f391d10d366e1a950c65c35b448f4 (diff)
media: imx-jpeg: Cleanup after an allocation error
[ Upstream commit 7500bb9cf164edbb2c8117d57620227b1a4a8369 ] When allocation failures are not cleaned up by the driver, further allocation errors will be false-positives, which will cause buffers to remain uninitialized and cause NULL pointer dereferences. Ensure proper cleanup of failed allocations to prevent these issues. Fixes: 2db16c6ed72c ("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: 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: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 3602324b254a..6e8d95a2406f 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -553,6 +553,7 @@ skip_alloc:
return true;
err:
dev_err(jpeg->dev, "Could not allocate descriptors for slot %d", jpeg->slot_data.slot);
+ mxc_jpeg_free_slot_data(jpeg);
return false;
}