Re: [PATCH v6 3/6] media: venus: venc: Clamp parm smaller than 1fps and bigger than 240

[Vikash Garodia]

On 1/11/2025 3:25 PM, Ricardo Ribalda wrote:
> The driver uses "whole" fps in all its calculations (e.g. in
> load_per_instance()). Those calculation expect an fps bigger than 1, and
> not big enough to overflow.
> 
> Clamp the parm if the user provides a value that will result in an invalid
> fps.
> 
> Reported-by: Hans Verkuil <hverkuil@xxxxxxxxx>
> Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147453e4@xxxxxxxxx/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0
> Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files")
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> ---
>  drivers/media/platform/qcom/venus/venc.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index c1c543535aaf..943d432b6568 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -411,11 +411,10 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
>  	us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC;
>  	do_div(us_per_frame, timeperframe->denominator);
>  
> -	if (!us_per_frame)
> -		return -EINVAL;
> -
> +	us_per_frame = max(USEC_PER_SEC, us_per_frame);
Same comment[1] made on 2/6 patch is applicable here as well.

[1]
https://patchwork.kernel.org/project/linux-arm-msm/patch/20250111-fix-cocci-v6-2-1aa7842006cc@xxxxxxxxxxxx/

Regards,
Vikash

>  	fps = (u64)USEC_PER_SEC;
>  	do_div(fps, us_per_frame);
> +	fps = min(VENUS_MAX_FPS, fps);
>  
>  	inst->timeperframe = *timeperframe;
>  	inst->fps = fps;
>