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 791A92DF6EC for ; Thu, 21 Aug 2025 14:47:22 +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=1755787642; cv=none; b=uxAuy+LKEMRpMJMMOUrWCJ05RLLshurcRDrOpGBOvaScHTSjwdQFXnKdM6V86/M6xrN0/5ygUxIO32b2szz8aM+1EK+H08j+YRb+6TB4mwaF5930vOd3ZoQOe/HM1pcQiQY2l95e/HxvJEXJlU9ZpO9/XAaZxqTdAdjQbzJsvrY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755787642; c=relaxed/simple; bh=oJVV1vOmwDmK5IdNnOvwC0hhtb2sCzdruZ85Bf5W+us=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Hi7Ze+ATCte8K7+25MzW3dVUGmugvbB8qqlUvB96kEZhreoiRJpTdvr4dJXBgDStL3ET8MGNWsQ80SZEowQFl3GM8yh3ZsGozWT97PwnjnVEwroRJ2H+xRXtmG3TNLviMaq8f9eWoRvOcKyQfZHopq2goDF9JYmecdVCSTenPXo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pDh0pg6A; 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="pDh0pg6A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00B0EC4CEEB; Thu, 21 Aug 2025 14:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755787642; bh=oJVV1vOmwDmK5IdNnOvwC0hhtb2sCzdruZ85Bf5W+us=; h=Subject:To:Cc:From:Date:From; b=pDh0pg6AS+m1L5p2K5zyDOxUTV8/LTG+8UMIUHoRoXkGPXIl27oQj1qqURNGQZWWY JKyMJlgq4DYzrOyN4vo58jduW5NBKI9wNTRXHxc8hzQIPcb9eWnff9AD6flWMu7HcS GKId3NvM95cJX1FutlVveZfbzLBNhb1qN3bx6Css= Subject: FAILED: patch "[PATCH] media: venus: venc: Clamp param smaller than 1fps and bigger" failed to apply to 5.10-stable tree To: ribalda@chromium.org,bod@kernel.org,hverkuil@xs4all.nl Cc: From: Date: Thu, 21 Aug 2025 16:44:22 +0200 Message-ID: <2025082122-diffused-barrette-30b6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 417c01b92ec278a1118a05c6ad8a796eaa0c9c52 # git commit -s git send-email --to '' --in-reply-to '2025082122-diffused-barrette-30b6@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 417c01b92ec278a1118a05c6ad8a796eaa0c9c52 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:15 +0000 Subject: [PATCH] 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: Hans Verkuil Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147453e4@xs4all.nl/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0 Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files") Cc: stable@vger.kernel.org Signed-off-by: Ricardo Ribalda [bod: Change "parm" to "param"] Signed-off-by: Bryan O'Donoghue Signed-off-by: Hans Verkuil diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index c7f8e37dba9b..b9ccee870c3d 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -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;