Skip to content

Commit 6fb617e

Browse files
ribaldagregkh
authored andcommitted
media: staging/intel-ipu3: Fix set_fmt error handling
commit ad91849 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@vger.kernel.org Fixes: 6d5f26f ("media: staging/intel-ipu3-v4l: reduce kernel stack usage") Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 74ba0ad commit 6fb617e

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/staging/media/ipu3/ipu3-v4l2.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
669669
struct imgu_css_pipe *css_pipe = &imgu->css.pipes[pipe];
670670
struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
671671
struct imgu_v4l2_subdev *imgu_sd = &imgu_pipe->imgu_sd;
672+
struct v4l2_pix_format_mplane fmt_backup;
672673

673674
dev_dbg(dev, "set fmt node [%u][%u](try = %u)", pipe, node, try);
674675

@@ -737,13 +738,17 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
737738
ret = -EINVAL;
738739
goto out;
739740
}
741+
fmt_backup = *fmts[css_q];
740742
*fmts[css_q] = f->fmt.pix_mp;
741743

742744
if (try)
743745
ret = imgu_css_fmt_try(&imgu->css, fmts, rects, pipe);
744746
else
745747
ret = imgu_css_fmt_set(&imgu->css, fmts, rects, pipe);
746748

749+
if (try || ret < 0)
750+
*fmts[css_q] = fmt_backup;
751+
747752
/* ret is the binary number in the firmware blob */
748753
if (ret < 0)
749754
goto out;

0 commit comments

Comments
 (0)