From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3AA6AC64ED6 for ; Mon, 27 Feb 2023 02:10:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 557CE10E339; Mon, 27 Feb 2023 02:10:04 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1BDA10E336; Mon, 27 Feb 2023 02:10:01 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2FBD660CF9; Mon, 27 Feb 2023 02:10:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1D70C433EF; Mon, 27 Feb 2023 02:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463800; bh=2KRm2l3JY2uKj7HESanxZ1bGdswzim8PwgzKABcw6e4=; h=From:To:Cc:Subject:Date:From; b=bzDdlNS4XK8HD024fngc73IQmtqqLjfL/6rP8SaKy9D3AseSv6zXYuNgoUIbhdaPE zPmZaudfentez7GuLr+EJfTI7MSLIMbDIAb9HmC80FvburLiy1M4MWIawvPA79Iuf0 PJ8s2yF9JttjFNPFCdiWvsa81bBr0jQxeY+BmhiQJ5i/fvsthmKU9wuIr9XPvEpWhW 7/a6aRcm3Qif4rhpLZ8QvhR8GVYV5bqnVVoJNUOlYFby7rCmzK7wlTm5vHzlT0+PlM gSs+Ita1NNDoGnNY6loCuoxcl1YHh0eO8Tx/xOOIbAcfRVeZQDjxCQm22U58ydM5jR S/U/tchWMptbA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 01/19] drm/amd/display: Fix potential null-deref in dm_resume Date: Sun, 26 Feb 2023 21:09:36 -0500 Message-Id: <20230227020957.1052252-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , stylon.wang@amd.com, Xinhui.Pan@amd.com, kernel test robot , sunpeng.li@amd.com, airlied@gmail.com, Wayne Lin , Rodrigo.Siqueira@amd.com, Roman Li , amd-gfx@lists.freedesktop.org, aurabindo.pillai@amd.com, hersenxs.wu@amd.com, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Jasdeep Dhillon , Alex Deucher , harry.wentland@amd.com, christian.koenig@amd.com, Dan Carpenter Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Roman Li [ Upstream commit 7a7175a2cd84b7874bebbf8e59f134557a34161b ] [Why] Fixing smatch error: dm_resume() error: we previously assumed 'aconnector->dc_link' could be null [How] Check if dc_link null at the beginning of the loop, so further checks can be dropped. Reported-by: kernel test robot Reported-by: Dan Carpenter Reviewed-by: Wayne Lin Acked-by: Jasdeep Dhillon Signed-off-by: Roman Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index fbe15f4b75fd5..dbdf0e210522c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2051,12 +2051,14 @@ static int dm_resume(void *handle) drm_for_each_connector_iter(connector, &iter) { aconnector = to_amdgpu_dm_connector(connector); + if (!aconnector->dc_link) + continue; + /* * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->dc_link && - aconnector->dc_link->type == dc_connection_mst_branch) + if (aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); -- 2.39.0