]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
authorTarang Raval <tarang.raval@siliconsignals.io>
Fri, 29 Aug 2025 10:14:24 +0000 (15:44 +0530)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Tue, 24 Mar 2026 21:14:44 +0000 (22:14 +0100)
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>
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c

index 867cdddf9f891d6d84da3dacb15e1764937c0ad7..20d88865081c33a9bd6a4adc1036841505e2a87f 100644 (file)
@@ -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;