From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8514F2E6106; Tue, 26 Aug 2025 13:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756213698; cv=none; b=cJLaaH5HFO0K6Nf/pJMet974CibC0TIauburkbs6nnHLueR7cAl40KnJTO9zT3PsDzimt0zKVccaZnxv1Bt1TKkW3wUZBppqy90ULFGLlLysVXDmH+dgM28+X943Fo7pu9zShEAZb6UysUDgdKZM/A/HDrQnmYaeetFSjixfypU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756213698; c=relaxed/simple; bh=rRtue76jUE96frLcLWtty51NQhCVbbFfaSie59l3eTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q8jyK5NUI7S1RmwbAtIsN5/4A4xT7oiOW2yLeSZ6ONNuuZmLqg9IP6mQUWi0P5cvUJ5hkxT1FO8Vjnz8KqOnAg9Oo1zk/j0joXliDTU+JkgyHv/WxdsEyDARGDjeVoO+GpTG57duTjYOtjqXREvLXD1345vey7S9d3YKxnfbA6c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ioW4kQpt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ioW4kQpt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A31F8C4CEF4; Tue, 26 Aug 2025 13:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756213697; bh=rRtue76jUE96frLcLWtty51NQhCVbbFfaSie59l3eTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ioW4kQptb7SFgKiwxJsRgQfisjM5HW6PIRWoYq8fetNlNA4OjAzNoXlsZK6ckoKTd K1FVb40iHg+1OQfW2r5pUC86RDS2MdOeOlv7wDMHYVAH05RXwiFbrUlrC45XgPwcxK NtVvl9W09QL/4q9CRkC4+eKxxy1F9hRS3YFZQef0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans Verkuil , Bryan ODonoghue , Ricardo Ribalda , Bryan ODonoghue Subject: [PATCH 6.6 415/587] media: venus: vdec: Clamp param smaller than 1fps and bigger than 240. Date: Tue, 26 Aug 2025 13:09:24 +0200 Message-ID: <20250826111003.495921626@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110952.942403671@linuxfoundation.org> References: <20250826110952.942403671@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo Ribalda commit 377dc500d253f0b26732b2cb062e89668aef890a 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 value if the user provides a param that will result in an invalid fps. Reported-by: Hans Verkuil 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 # qrb5615-rb5 Reviewed-by: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda [bod: Change "parm" to "param"] Signed-off-by: Bryan O'Donoghue Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/core.h | 2 ++ drivers/media/platform/qcom/venus/vdec.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -28,6 +28,8 @@ #define VIDC_PMDOMAINS_NUM_MAX 3 #define VIDC_RESETS_NUM_MAX 2 +#define VENUS_MAX_FPS 240 + extern int venus_fw_debug; struct freq_tbl { --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -481,11 +481,10 @@ static int vdec_s_parm(struct file *file 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;