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 E5FF31B9B52; Wed, 25 Sep 2024 11:47:08 +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=1727264829; cv=none; b=Q5Dev8CTFe4UjzPOaez91pEAJ4WCyncuIUH8Ds8aLMjpAraqc5us6PCXe8jqoeiCpDy94N1BXM/rIP90CgH2yPwwPnud5slH5WksmWtMb6XMoGiBK9PujnR0X9efQf/ijQ8ZzSUT3qdf1GXWk4IUYstdGS1Nqk6FI9zFaTJXFOg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264829; c=relaxed/simple; bh=kF6RvkLxqI02RrnAuVGVZ3sm5FL0CzeDfPDuo0gquvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iICiFZJCcT3TokBQ14mDgX5kg70LGV5NHXdRxG0l/mY2sN1OIBHMsKatlGUd305o6CXNstfR8KjqrTP162gf58TyQsAFk0qSCXJwUrmIZ12undxBGMMcaMQOOZFY5t7qg0a6HMdilrRrm1qOR+mxUpmKUlHw36ELggRztwDSTH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OfA4jTbo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OfA4jTbo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4100C4CECE; Wed, 25 Sep 2024 11:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264828; bh=kF6RvkLxqI02RrnAuVGVZ3sm5FL0CzeDfPDuo0gquvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfA4jTbogbkcTuFWbhTJMLuo7MtJ5GBatYmX8FXY0YbBSJr7vXe3wJpJiGmk6/qIF W14SwlJ8UbKpb83nm0Hl50mCg8z3kKVou1tHFDx6mSM8RK27sIY1MbnbX3Kz2OtVfR UrRmugOBoKdpT8C+DqSrHIwkaqqHHxt8h1DC0Sh+l17utF62BsOghF1iq4gJuM60K3 TVRJzs8uQ0eAcMTBXWUdLo0kF+OeEicJs4+EilNm32F1QGYK+8suOCUpWUrTWVLbTb HG0PwZLaZezC5hiHr3MGRH6wdB5+quy6/pUwwOOby+nwkoqLxXnM33M8zv2Vn9pmLS Q4SyihhtyUmTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Hung , Rodrigo Siqueira , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alvin.lee2@amd.com, wayne.lin@amd.com, wenjing.liu@amd.com, sungjoon.kim@amd.com, aurabindo.pillai@amd.com, dillon.varone@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 157/244] drm/amd/display: Check null pointers before using dc->clk_mgr Date: Wed, 25 Sep 2024 07:26:18 -0400 Message-ID: <20240925113641.1297102-157-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit From: Alex Hung [ Upstream commit 95d9e0803e51d5a24276b7643b244c7477daf463 ] [WHY & HOW] dc->clk_mgr is null checked previously in the same function, indicating it might be null. Passing "dc" to "dc->hwss.apply_idle_power_optimizations", which dereferences null "dc->clk_mgr". (The function pointer resolves to "dcn35_apply_idle_power_optimizations".) This fixes 1 FORWARD_NULL issue reported by Coverity. Reviewed-by: Rodrigo Siqueira Signed-off-by: Alex Hung Signed-off-by: Tom Chung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 9e7ba846e032b..81fab62ef38eb 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -5383,7 +5383,8 @@ void dc_allow_idle_optimizations_internal(struct dc *dc, bool allow, char const if (allow == dc->idle_optimizations_allowed) return; - if (dc->hwss.apply_idle_power_optimizations && dc->hwss.apply_idle_power_optimizations(dc, allow)) + if (dc->hwss.apply_idle_power_optimizations && dc->clk_mgr != NULL && + dc->hwss.apply_idle_power_optimizations(dc, allow)) dc->idle_optimizations_allowed = allow; } -- 2.43.0