summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarang Raval <tarang.raval@siliconsignals.io>2025-08-29 13:14:24 +0300
committerHans Verkuil <hverkuil+cisco@kernel.org>2026-03-25 00:14:44 +0300
commit4de17cce8f0f65e85b3cec686437355b4452834d (patch)
tree6e002c1cbf1ea2c5f09d515f87e3a58114c9649e
parentafa4b9befb3e90d34d2b8b41c6f3cc3c49c3d086 (diff)
downloadlinux-4de17cce8f0f65e85b3cec686437355b4452834d.tar.xz
media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
Reject unsupported pixel formats in rkisp1_enum_framesizes() to fix v4l2-compliance failure. v4l2-compliance test failure: fail: ../utils/v4l2-compliance/v4l2-test-formats.cpp(403): Accepted framesize for invalid format test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL Tested on: Debix i.MX8MP Model A Kernel version: v6.17-rc3 v4l2-compliance: 1.31.0-5387 Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io> Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Link: https://patch.msgid.link/20250829101425.95442-1-tarang.raval@siliconsignals.io Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
-rw-r--r--drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index 867cdddf9f89..20d88865081c 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -1380,6 +1380,9 @@ static int rkisp1_enum_framesizes(struct file *file, void *fh,
};
struct rkisp1_capture *cap = video_drvdata(file);
+ if (!rkisp1_find_fmt_cfg(cap, fsize->pixel_format))
+ return -EINVAL;
+
if (fsize->index != 0)
return -EINVAL;