From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5A8B4429CE0; Fri, 7 Aug 2026 15:16:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115779; cv=none; b=ctPMSxsb6wIaLse+h+UpITN3Fuy/7mI3m/c8qelQq8dQGDrsAsV7kWCXaa8fapHXFgx2UcLd84j/BU/zKjs62hs6iR0J3pvO28UHph4Omm3Qe48csEn/JWOO86Y9warI5yFFV4IlVYaep6Sl8NdRmq4b+TaqcRZD2uWofZZZLAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786115779; c=relaxed/simple; bh=4jnQkGTkYEZFvsjkJPc8M1f9QpUx+iLluasD5PDoq6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z4gGUNSKsf5zNCEtD4xlg+VnKKbmX9r/SYr8SXJKfKpeBieQgvS7Pslj/4CV88FEgqZ3FNgEd3ptgEu8vxJ7RtW7SfeIj3jzIpHRGlTgOenQ/wQqz/HhAq6qkLEEkbdG/BM60B6YtdJYIU6KokNE7ZPtKJ2xjIZrrHU3yUU1i6Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jQUdHQf6; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jQUdHQf6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B75B61F000E9; Fri, 7 Aug 2026 15:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786115778; bh=k8ScaZ7sHzPlNPbTXewMsSo0lvvGGyTy4eq5vZR1mgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jQUdHQf6pvptdk4iKlgPnM5wRd7sJapiwXPpaGQcFAsuAstD6s05NBrRtkvl9iVBx KfAimGuziUrHhI/q9yuSigJWWcLJg4Aiztf2+PNBotjTzkB4g+VWmimTuRt3vFAzAG RqnarHFZQhMGNXShF8NkQ1tfKKprKlRxZ08jfbtw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Martin Hodo , Ankit Nautiyal , Jani Nikula , Joonas Lahtinen , Sasha Levin Subject: [PATCH 6.18 387/396] drm/i915/vrr: require valid min/max vfreq for VRR Date: Fri, 7 Aug 2026 16:39:07 +0200 Message-ID: <20260807143432.624264081@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143424.272339768@linuxfoundation.org> References: <20260807143424.272339768@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jani Nikula [ Upstream commit f8a9262c7a6fc2de9802e14b0228114f0333869e ] Ensure the EDID provided min/max vfreq are valid. Most scenarios are already covered (by coincidence) through the checks in intel_vrr_is_capable() and intel_vrr_is_in_range(), but be more explicit about it. At worst, a zero min_vfreq could lead to a division by zero in intel_vrr_compute_vmax(). Discovered using AI-assisted static analysis confirmed by Intel Product Security. Reported-by: Martin Hodo Fixes: 117cd09ba528 ("drm/i915/display/dp: Compute VRR state in atomic_check") Cc: stable@vger.kernel.org # v5.12+ Cc: Ankit Nautiyal Reviewed-by: Ankit Nautiyal Link: https://patch.msgid.link/20260625131040.1051272-1-jani.nikula@intel.com Signed-off-by: Jani Nikula (cherry picked from commit 1765cf59f517b02f3b0591fe5120930d08bddeb6) Signed-off-by: Joonas Lahtinen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_vrr.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/i915/display/intel_vrr.c +++ b/drivers/gpu/drm/i915/display/intel_vrr.c @@ -49,6 +49,10 @@ bool intel_vrr_is_capable(struct intel_c return false; } + if (!info->monitor_range.min_vfreq || !info->monitor_range.max_vfreq || + info->monitor_range.min_vfreq > info->monitor_range.max_vfreq) + return false; + return info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10; }