Commit 417c01b9 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: venus: venc: Clamp param smaller than 1fps and bigger than 240 



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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147453e4@xs4all.nl/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0


Fixes: aaaa93ed ("[media] media: venus: venc: add video encoder files")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
[bod: Change "parm" to "param"]
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent 377dc500

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

+2 −3
Original line number Diff line number Diff line
@@ -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;