]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: venus: venc: Clamp param smaller than 1fps and bigger than 240
authorRicardo Ribalda <ribalda@chromium.org>
Mon, 16 Jun 2025 15:29:15 +0000 (15:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:34:28 +0000 (16:34 +0200)
commit 417c01b92ec278a1118a05c6ad8a796eaa0c9c52 upstream.

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 param if the user provides a value that will result in an invalid
fps.

Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147453e4@xs4all.nl/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0
Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files")
Cc: stable@vger.kernel.org
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
[bod: Change "parm" to "param"]
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/qcom/venus/venc.c

index c7f8e37dba9b2218c0988dbfad1f7c04e055bbb0..b9ccee870c3d1238e04cef5e9344bd992d86d737 100644 (file)
@@ -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 = clamp(us_per_frame, 1, USEC_PER_SEC);
        fps = (u64)USEC_PER_SEC;
        do_div(fps, us_per_frame);
+       fps = min(VENUS_MAX_FPS, fps);
 
        inst->timeperframe = *timeperframe;
        inst->fps = fps;