linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
@ 2025-08-29 10:14 Tarang Raval
  2025-09-10  9:55 ` Tarang Raval
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Tarang Raval @ 2025-08-29 10:14 UTC (permalink / raw)
  To: laurent.pinchart
  Cc: Tarang Raval, Dafna Hirschfeld, Mauro Carvalho Chehab,
	Heiko Stuebner, linux-media, linux-rockchip, linux-arm-kernel,
	linux-kernel

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>
---
 drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index 6dcefd144d5a..107937b77153 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -1383,6 +1383,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;
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
  2025-08-29 10:14 [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats Tarang Raval
@ 2025-09-10  9:55 ` Tarang Raval
  2025-09-16 12:56 ` Kieran Bingham
  2025-11-05 18:21 ` Laurent Pinchart
  2 siblings, 0 replies; 5+ messages in thread
From: Tarang Raval @ 2025-09-10  9:55 UTC (permalink / raw)
  To: laurent.pinchart@ideasonboard.com
  Cc: Dafna Hirschfeld, Mauro Carvalho Chehab, Heiko Stuebner,
	linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org

Hi Laurent,
 
> 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

Could you please consider picking this for v6.18?

Best Regards,
Tarang

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
  2025-08-29 10:14 [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats Tarang Raval
  2025-09-10  9:55 ` Tarang Raval
@ 2025-09-16 12:56 ` Kieran Bingham
  2025-10-30  7:50   ` Tarang Raval
  2025-11-05 18:21 ` Laurent Pinchart
  2 siblings, 1 reply; 5+ messages in thread
From: Kieran Bingham @ 2025-09-16 12:56 UTC (permalink / raw)
  To: Tarang Raval, laurent.pinchart
  Cc: Tarang Raval, Dafna Hirschfeld, Mauro Carvalho Chehab,
	Heiko Stuebner, linux-media, linux-rockchip, linux-arm-kernel,
	linux-kernel

Quoting Tarang Raval (2025-08-29 11:14:24)
> 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

Tested here also on a debix board running v4l2-compliance before and
after.

Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Kernel version: v6.17-rc3
> v4l2-compliance: 1.31.0-5387
> 
> Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
> ---
>  drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> index 6dcefd144d5a..107937b77153 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> @@ -1383,6 +1383,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;
>  
> -- 
> 2.34.1
>


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
  2025-09-16 12:56 ` Kieran Bingham
@ 2025-10-30  7:50   ` Tarang Raval
  0 siblings, 0 replies; 5+ messages in thread
From: Tarang Raval @ 2025-10-30  7:50 UTC (permalink / raw)
  To: laurent.pinchart@ideasonboard.com
  Cc: Kieran Bingham, Dafna Hirschfeld, Mauro Carvalho Chehab,
	Heiko Stuebner, linux-media@vger.kernel.org,
	linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org

Hi Laurent,                                                                     
                                                                                
> > 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                                            
>                                                                               
> Tested here also on a debix board running v4l2-compliance before and          
> after.                                                                        
>                                                                               
> Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>                                                                                                                          
Could you please pick this patch?
                                                                         
Best regards,                                                                   
Tarang                                                                          

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats
  2025-08-29 10:14 [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats Tarang Raval
  2025-09-10  9:55 ` Tarang Raval
  2025-09-16 12:56 ` Kieran Bingham
@ 2025-11-05 18:21 ` Laurent Pinchart
  2 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2025-11-05 18:21 UTC (permalink / raw)
  To: Tarang Raval
  Cc: Dafna Hirschfeld, Mauro Carvalho Chehab, Heiko Stuebner,
	linux-media, linux-rockchip, linux-arm-kernel, linux-kernel

Hi Tarang,

Thank you for the patch.

On Fri, Aug 29, 2025 at 03:44:24PM +0530, Tarang Raval wrote:
> 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>

I've tested this with libcamera, so

Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> index 6dcefd144d5a..107937b77153 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> @@ -1383,6 +1383,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;
>  

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-11-05 18:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-29 10:14 [PATCH] media: rkisp1: Fix enum_framesizes accepting invalid pixel formats Tarang Raval
2025-09-10  9:55 ` Tarang Raval
2025-09-16 12:56 ` Kieran Bingham
2025-10-30  7:50   ` Tarang Raval
2025-11-05 18:21 ` Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).