From patchwork Mon Jun 16 15:29:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 897603 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9904220F54 for ; Mon, 16 Jun 2025 15:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087762; cv=none; b=OidZF61fxGe+FhkdF7XmgOPMZYCk3xCCUQxdyRlkcRYHY4wF98GK/tcG8e1uQZUG1QBzj2h6o3lSKCRsFDxbwCbK+KqcU2U7xcpR+cSqR5Opw9q/y53XavpRun1MHRb1HbxFS+9+DBpySfXlNYJEzZVUj13euQ5SSa5gbOVUWZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087762; c=relaxed/simple; bh=pnwKaxykfNl41aVSJ0fgQXHFHUyk5NTEvR8PclHUs2U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sD0hfgAyJJXPoyMYy5cmeN99d2oSUUcJjsBjkLSKvOURRI9AfqhShukbX3/1icgYOfjkXnI1ohdvCeAuVq/zN691+0Y65GmUqubxZSBjQdaoSI64tUn5TxxxW/654MNXj8cxGUJ3SD1kw44E6buPNwXS48U10354XRyboGs6mTA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ZTNid2kG; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZTNid2kG" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-54d98aa5981so5862436e87.0 for ; Mon, 16 Jun 2025 08:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087759; x=1750692559; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kMUfpPv+dKOq5nGqXppL/8SlSmSo+MNRFt4xE51N1U0=; b=ZTNid2kG4zqcEvyUL/hWbtfy9fOiKHVrhvXPfsU//3Psk9cQ2Ktu+E82jwPaR9dk1k BIJxf+DQZlQfZp1hZA4XYE8iGMDHDsRhWMDXtO9d5faEPifYT70gP8b5yLyCtHZt3AfI pm/iMMu6/rimtmbd1oJ+D/brBEXyJlue94G1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087759; x=1750692559; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kMUfpPv+dKOq5nGqXppL/8SlSmSo+MNRFt4xE51N1U0=; b=jafhRRDqDRwgpdaaDWt6EY5NXRWnkpnjaXILmHtg7YamI6qJmV2PyZ/kooqh8+wR9T /cY4ixA9YR6bS/28Ros4eEvj6bFYtOF/IcTUCCyXYlipkl0vesZywBTfyR9uSKk5PH08 JAW3c5UEMuR1OFT24pxNssVqCr58YozzYbYT8LjBbxuYW5ieLReBseqxWLjaYnhKVGpq wxmO0hDbE4lhMcfM59KDgHWX9F4O5droIkEKUDE6YvNCzkAsMJwdkQq7HKkdgvdeQMxg DYKFJcHcK3/kwIPs87N7VBX6V0znlieIiZb10tSdFBJ9oVJpGNpcIIttXmlIBA/MVCBf 94VQ== X-Forwarded-Encrypted: i=1; AJvYcCWcm0vO1ZRtAP3ET2Ezh/953Ir7cZNviFVT746fd+z1TYZqCCeiq9k6SVz1ykbjpCHe0J6tZIAAMU17PuTG@vger.kernel.org X-Gm-Message-State: AOJu0Yz9U6aEXuzbyZ5Mv/ikQBTmLJ/B4io8hHPfqGeeZvcH/VHV4Sfg wwRQTUN9cGx8pfWUT7T5eii6i3mTkd8QADSteTy+F4/pYnHzcm3QOv7jErKZeVMeQQ== X-Gm-Gg: ASbGncvhgN17g/Bivg6COwUss7r3he6kGPKFMKOcjXZgHL4c9YALZI3TMeCtWEkxnDj wiQxkePRF8x7F+4jwNvXWhLKiCU/R5QyzE+ADq4FVjPzRtzOSLz/E7dq0hB8/ERsgYgV6pYM0UX gPnrcUAiA8EUaY/iQi+Iwp11FxA/Qznm7wl6M9UplbH0n/ayQeD4Q0lrSgZyk+dNfSMl3DB9PEf ubk1ws9VqRpz29bjWegTqxceBeCM4Nww6/t+X3ExAbONq9P20peVqt1KXZJ2rsaoHKnu5D8NOxG Rl8VDka3B2j8qJJoRsydpPEOF5JFBmDE8FE11sv4kVQwRfJgAc5nGD/ytk9qGP7FwtetpWM6r45 5P4FXNyBenGc1SLvSuEtEI7xz43+f8F7/387bGAIFsQ== X-Google-Smtp-Source: AGHT+IFD7e6mqRIDzO29wojSrb1K2/2adoVUhXjbM4ngtgXAPyANGqcX+Ed9wMyzJi7Yviy9nzQ6+Q== X-Received: by 2002:a05:6512:3b11:b0:553:2f33:ac0e with SMTP id 2adb3069b0e04-553b6f25d94mr2553688e87.41.1750087758806; Mon, 16 Jun 2025 08:29:18 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:18 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:14 +0000 Subject: [PATCH v7 1/5] media: venus: vdec: Clamp parm smaller than 1fps and bigger than 240. Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250616-test-v7-1-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Hans Verkuil X-Mailer: b4 0.14.2 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 parm 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") Tested-by: Bryan O'Donoghue # qrb5615-rb5 Reviewed-by: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/core.h | 2 ++ drivers/media/platform/qcom/venus/vdec.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index b412e0c5515a0916f6a8969ad3be01841e09edca..5b1ba1c69adba14c3560a4bc6d09435529f295a6 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -28,6 +28,8 @@ #define VIDC_RESETS_NUM_MAX 2 #define VIDC_MAX_HIER_CODING_LAYER 6 +#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 99ce5fd41577284098dca54c7772da0691cf29a5..fca27be61f4b869840904cc0577949635bc63cab 100644 --- 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, 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;