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 B1F5018C011; Wed, 25 Sep 2024 12:04:12 +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=1727265852; cv=none; b=IxBontRVMN/+eOPA6J+lT0misfaYBq2r2G3fYYQpZuSVEjhPuMBmXzFPpIfGV4Ktn/bzWXNd3f9a3EjG5ddiusX9TtOf9Be+CMnxS0n6ZeKxLgJlcKgb8DCELPGHqhgQT0w1sEA4UHBJUX4Iy6KLTkdoDf9NxDKByDh+QwWQmT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727265852; c=relaxed/simple; bh=CEYj+LE+sYRMyQL552xYLSxHrHiF1QvXFtN2GGdV2E8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bU4alOHAhlmMSFcqvA3/P57ZnSjnOb3eYmKoWyhtZE3wGvwGh1Z1n29hJqB4IK8+nZ2XzyoWgOHBL0nEYd/WPUAdGEBmoXnCPdBdZgLThpa4g6ADQfeIbODpiIJrXB/2isVC0/A8ltkQI28k8/WNEP5tKOoGa0/gZccQ776E1BI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AhRjaGde; 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="AhRjaGde" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FB3AC4CEC3; Wed, 25 Sep 2024 12:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727265852; bh=CEYj+LE+sYRMyQL552xYLSxHrHiF1QvXFtN2GGdV2E8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AhRjaGdeiJzuwEJwtZRlCy5X7fS8JW1HP5IvKknRfIkPZZeOgXU+EkyYjStok1Ivb B0D2w5VIV+rPZGvv50buPrAryWGHq6c0sJge/8kdHXI6NgGFRo+1NHbldntN68g53E HZ1qW9J5nSE4DGtSv5wIs/6wh986gR4J/JLdgP/j7AYhYi2nRLhb6R6e/h1VwhpnO3 wQUP0WptRw15GWLZKyTV9RIRgm2sZVAkIU3aW+AB3MRrUXgQh2Cp4jaaBmPt/uiA2i IjwIwS6a1midbFRkmHNKUFYbRys/5b8ySAMYFiKvstZcxVgGjP7MKJpOPJoD+Fw717 oBr8k7waT+Now== 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.10 114/197] drm/amd/display: Check null pointers before using them Date: Wed, 25 Sep 2024 07:52:13 -0400 Message-ID: <20240925115823.1303019-114-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925115823.1303019-1-sashal@kernel.org> References: <20240925115823.1303019-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.10.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 27e641f176289..3c418428264ca 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6935,6 +6935,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, @@ -8947,7 +8950,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); @@ -9346,9 +9349,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