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 AB3EE199935; Tue, 26 Aug 2025 11:40:48 +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=1756208448; cv=none; b=pkBNMZVjCr7XX2AdJL3amaTb02A015rhMuCQghYl8V2779EkoRGI6q3Wuocz7jRfPoL4By2o3qmXuguTDpPlNmUexwoRidl0Pb+jpx3BEP4aOKD4FGUZauCpIdhwMI17gzDSZOyw6B/i2mFMI3IPQfk3rgW3+ayweVrPmfG0UQ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756208448; c=relaxed/simple; bh=hGLCeozpeShmt/+XUBIdNd72DY2tOUg0JVPnkYeBdsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hW/2EJeUjgGyGL/LT4VjmqUlTmerWJuo8UkMZlhu2hJcZS/lTB2A0AYebY+7xClG5abHeubc1PQjhl6N65U7d0x5GkasA59TQEyiT02NIP8FqQUEN2ypa7BeelgCV1qLDD2n3aYx/4bu+9MrJFmolT8uG9lLw7PkjL6yk2srQq4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1il7GUXr; 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="1il7GUXr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FC64C4CEF1; Tue, 26 Aug 2025 11:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756208448; bh=hGLCeozpeShmt/+XUBIdNd72DY2tOUg0JVPnkYeBdsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1il7GUXrxxKdDcJhyy5ZyyCqsyfg0MZhxHi73jPDY1LrRyXed86bbJvDnzE2RleED GLytZa1oSAUXooxHBJ7ZFOFULoN6Fb3u9DJo+/FBGdCYChdtEZ0kz2fg7waRoPGOTM r0e6ZQxT5nG5vd3C9UeX3wskeej4hCZMVGldJYo0= 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.12 116/322] media: venus: vdec: Clamp param smaller than 1fps and bigger than 240. Date: Tue, 26 Aug 2025 13:08:51 +0200 Message-ID: <20250826110918.658873522@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110915.169062587@linuxfoundation.org> References: <20250826110915.169062587@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.12-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 @@ -27,6 +27,8 @@ #define VIDC_VCODEC_CLKS_NUM_MAX 2 #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;