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 D681818DF76; Wed, 25 Sep 2024 11:43:15 +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=1727264595; cv=none; b=KatCDNgA14SEZh61BKhcm8mVkwIK6CvsvCXZo1eNwO+U8g/DhDARR5sQonHfcy9YdR5j3cd4yYwzBFXtooLPp6vJpt8n6as/Kry3tkS3kTrY7CedNgF6Jr44fMyVnWT7cpVFtMdjMphoT8nxd3s3UgxbsMpsa46dm+zP+rSYZlw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264595; c=relaxed/simple; bh=aBQiBthAoXHyRIMwm3pPcJ3Kdf2+qtQ0LlM6Qg/Ow+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r394XrPQgsZdnfzpAwHtlhUEUmsd/2QDUkobzKh0teS7I6HuVSe61El8gOTIJuRO36Ts0RYWAAIwHsC/w+OniV0yGlQ8zzaBbQ5KowbmryyGqLEHyEnPthW1C8oXCGgUKp/eLzXo7lpuFlU42MuAL145+KBY0ip63Lx6x2V3lhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pCeqrKvJ; 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="pCeqrKvJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30469C4CEC7; Wed, 25 Sep 2024 11:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264595; bh=aBQiBthAoXHyRIMwm3pPcJ3Kdf2+qtQ0LlM6Qg/Ow+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pCeqrKvJAHIKsqN6MaIH2tRZrSgRAuI2K0RGPlDlSne/r3eQTSPPSwZg7JmWneHJR u8p83MN7ezneGiULQg3Su/wGMNJzBdsPekaDkEqlT8f9Luo+Fj5Sb+1R/jHxgfUxeC J7R4QeEz9sgms6UBw78i/h2ZWep4e42nWPiUcJMFSEYdb6FEAH5AZI6Pfnqsh8aMV9 ZTKrsDCv+0UrIOz2UCdPFjJJap11OQDf4w+sIycgYbcTtH4caPznYHHhekENy39tlN 7rNOKm4Lvr0tuXtp01bGCZyKnThS8OtrMQ/leyXIN746c+9EDOG1Z2L3hx8Zk5utdp OLCcj+8t5Qwcg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Hung , Rodrigo Siqueira , Jerry Zuo , 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, hamza.mahfooz@amd.com, roman.li@amd.com, mario.limonciello@amd.com, aurabindo.pillai@amd.com, Wayne.Lin@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 131/244] drm/amd/display: Check null pointers before using them Date: Wed, 25 Sep 2024 07:25:52 -0400 Message-ID: <20240925113641.1297102-131-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 1ff12bcd7deaeed25efb5120433c6a45dd5504a8 ] [WHAT & HOW] These pointers are null checked previously in the same function, indicating they might be null as reported by Coverity. As a result, they need to be checked when used again. This fixes 3 FORWARD_NULL issue reported by Coverity. Reviewed-by: Rodrigo Siqueira Signed-off-by: Jerry Zuo Signed-off-by: Alex Hung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 1e069fa5211ee..264e67634dcdc 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7233,6 +7233,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8; enum dc_status dc_result = DC_OK; + if (!dm_state) + return NULL; + do { stream = create_stream_for_sink(connector, drm_mode, dm_state, old_stream, @@ -9340,7 +9343,7 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, if (acrtc) old_crtc_state = drm_atomic_get_old_crtc_state(state, &acrtc->base); - if (!acrtc->wb_enabled) + if (!acrtc || !acrtc->wb_enabled) continue; dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); @@ -9744,9 +9747,10 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) DRM_INFO("[HDCP_DM] hdcp_update_display enable_encryption = %x\n", enable_encryption); - hdcp_update_display( - adev->dm.hdcp_workqueue, aconnector->dc_link->link_index, aconnector, - new_con_state->hdcp_content_type, enable_encryption); + if (aconnector->dc_link) + hdcp_update_display( + adev->dm.hdcp_workqueue, aconnector->dc_link->link_index, aconnector, + new_con_state->hdcp_content_type, enable_encryption); } } -- 2.43.0