From: Tarang Raval Date: Fri, 29 Aug 2025 10:14:24 +0000 (+0530) Subject: media: rkisp1: Fix enum_framesizes accepting invalid pixel formats X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de17cce8f0f65e85b3cec686437355b4452834d;p=thirdparty%2Fkernel%2Fstable.git 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 Tested-by: Laurent Pinchart Reviewed-by: Laurent Pinchart Tested-by: Kieran Bingham Link: https://patch.msgid.link/20250829101425.95442-1-tarang.raval@siliconsignals.io Signed-off-by: Laurent Pinchart Signed-off-by: Hans Verkuil --- diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c index 867cdddf9f891..20d88865081c3 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;