Skip to content

Commit 7cbce62

Browse files
ribaldagregkh
authored andcommitted
media: venus: venc: Clamp param smaller than 1fps and bigger than 240
commit 417c01b 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: aaaa93e ("[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>
1 parent 974aba0 commit 7cbce62

File tree

1 file changed

+2
-3
lines changed
  • drivers/media/platform/qcom/venus

1 file changed

+2
-3
lines changed

drivers/media/platform/qcom/venus/venc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,10 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
411411
us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC;
412412
do_div(us_per_frame, timeperframe->denominator);
413413

414-
if (!us_per_frame)
415-
return -EINVAL;
416-
414+
us_per_frame = clamp(us_per_frame, 1, USEC_PER_SEC);
417415
fps = (u64)USEC_PER_SEC;
418416
do_div(fps, us_per_frame);
417+
fps = min(VENUS_MAX_FPS, fps);
419418

420419
inst->timeperframe = *timeperframe;
421420
inst->fps = fps;

0 commit comments

Comments
 (0)