This is a note to let you know that I've just added the patch titled
media: staging/intel-ipu3: Fix set_fmt error handling
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-staging-intel-ipu3-fix-set_fmt-error-handling.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ad91849996f9dd79741a961fd03585a683b08356 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
Date: Wed, 10 Mar 2021 01:16:46 +0100
Subject: media: staging/intel-ipu3: Fix set_fmt error handling
From: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
commit ad91849996f9dd79741a961fd03585a683b08356 upstream.
If there in an error during a set_fmt, do not overwrite the previous
sizes with the invalid config.
Without this patch, v4l2-compliance ends up allocating 4GiB of RAM and
causing the following OOPs
[ 38.662975] ipu3-imgu 0000:00:05.0: swiotlb buffer is full (sz: 4096 bytes)
[ 38.662980] DMA: Out of SW-IOMMU space for 4096 bytes at device 0000:00:05.0
[ 38.663010] general protection fault: 0000 [#1] PREEMPT SMP
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 6d5f26f2e045 ("media: staging/intel-ipu3-v4l: reduce kernel stack usage")
Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/media/ipu3/ipu3-v4l2.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -668,6 +668,7 @@ static int imgu_fmt(struct imgu_device *
struct imgu_css_pipe *css_pipe = &imgu->css.pipes[pipe];
struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
struct imgu_v4l2_subdev *imgu_sd = &imgu_pipe->imgu_sd;
+ struct v4l2_pix_format_mplane fmt_backup;
dev_dbg(dev, "set fmt node [%u][%u](try = %u)", pipe, node, try);
@@ -736,6 +737,7 @@ static int imgu_fmt(struct imgu_device *
ret = -EINVAL;
goto out;
}
+ fmt_backup = *fmts[css_q];
*fmts[css_q] = f->fmt.pix_mp;
if (try)
@@ -743,6 +745,9 @@ static int imgu_fmt(struct imgu_device *
else
ret = imgu_css_fmt_set(&imgu->css, fmts, rects, pipe);
+ if (try || ret < 0)
+ *fmts[css_q] = fmt_backup;
+
/* ret is the binary number in the firmware blob */
if (ret < 0)
goto out;
Patches currently in stable-queue which might be from ribalda@xxxxxxxxxxxx are
queue-5.4/media-staging-intel-ipu3-fix-race-condition-during-set_fmt.patch
queue-5.4/media-staging-intel-ipu3-fix-set_fmt-error-handling.patch
queue-5.4/media-staging-intel-ipu3-fix-memory-leak-in-imu_fmt.patch
