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

[ Upstream commit 377dc500d253f0b26732b2cb062e89668aef890a ]

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 value if the user provides a param 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: 7472c1c69138 ("[media] media: venus: vdec: add video decoder files")
Cc: stable@vger.kernel.org
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # qrb5615-rb5
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 785a5bbb19c3cecb3223ba6639f0e03ccc6bea46..0abb152c681f249e64abe5bf22eabfa9317a418f 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -25,6 +25,8 @@
 #define VIDC_VCODEC_CLKS_NUM_MAX       2
 #define VIDC_PMDOMAINS_NUM_MAX         3
 
+#define VENUS_MAX_FPS                  240
+
 extern int venus_fw_debug;
 
 struct freq_tbl {

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 68390143d37df46d6c16f9aec2e0076f0e478dfe..b18459c5290c4640ddd79a8432884b3a029e2dfa 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -427,11 +427,10 @@ static int vdec_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->fps = fps;
        inst->timeperframe = *timeperframe;