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 8FD231DE4FA; Tue, 8 Oct 2024 12:23:32 +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=1728390212; cv=none; b=htv2MHEzOSaMQG78tWNcytmIm4y0n+FR44pYiJTqXMlpW7cwIXtnARCKg0h4pxdgbaqaAUC+K9NYr2hn9anzaqb8D2/EevqT1OWXt/YbN6IAOz9XW8OhzdSY+hQodxlV8nOJmKJuiUTqBMy67FdCEWmPFGCByXVLq/io39nQtPg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728390212; c=relaxed/simple; bh=glesbILIzO/3jYIgakAwVvDb0JZRDfoNWY2vG1NJid0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bxsbsFRuhOI8HlvFJrlFEA+vfgvvyKtQF1MKczvKooLWWwHXrgepjhVGGyA+dV0eyBpng5j4KsaX/IiaPUd8z1cRzWiyHertGLA46e6jQpiPcvhqYzASBGFxU4pjSbJa3PkJmboqvpQ/CgmTqVkqpHxTbh2O0OtxDE2zI6v4kGI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WQ31ibfc; 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="WQ31ibfc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19F37C4CECE; Tue, 8 Oct 2024 12:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728390212; bh=glesbILIzO/3jYIgakAwVvDb0JZRDfoNWY2vG1NJid0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WQ31ibfc0SKlY1nK3lzZQIMduw1KwG4WBwkEB1M6IiOD2O0HUGE2f9PvuOvUyK05Y SSdWexFWpISQVbpuYKwO+oqsicmaHnSJMbf2jGD6kywxNkq71839a9EfKKFiu7g69X qFxgkGOj9hJuElKuLYqhp6yGLk3HaOPALRf0m/CY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rodrigo Siqueira , Alex Hung , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 6.10 192/482] drm/amd/display: Check null pointers before using dc->clk_mgr Date: Tue, 8 Oct 2024 14:04:15 +0200 Message-ID: <20241008115655.859424739@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115648.280954295@linuxfoundation.org> References: <20241008115648.280954295@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ 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 3bd18e862945f..daeb80abf435f 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -5211,7 +5211,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