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 E73A1186E39; Wed, 25 Sep 2024 11:46:18 +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=1727264779; cv=none; b=n3ugkvVwhDC23rtSfcIgGQiKbECG90dF5NxuF0k/DyrWhKLzZa1gNclYoPVIH2hsr6Y7G46ObRh/OuyJWkh1PCxR69qLymzsfvSjYYXK/lssyRLjI8mENUNd87dUWl8WPHI4VoV0SXN/eSkZMnnqU1iwkw2Kwf5a/ZUb3GbB7OE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264779; c=relaxed/simple; bh=JytCpwE5SrfXmnVBZL4CFtCh/V2KHj1wRYRjKSzfJQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nnxQp8Vzc4jz4bBQK+4Aj5Y1tr/PX2YGJcYrrkZKuSsbANkVnRFyF2Ta16TtyaG2xz+0atVMt81fdyzPEig5Bdu4jNhv0SwL+M0JpF1a+vXJU3Q6Pbyo2Zn77bva65m+4cUWeggcnUZIpfs+kpEBVZmHv+zRsuYyJDFbb1jQNZ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZzHp9P5h; 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="ZzHp9P5h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 188B0C4CECD; Wed, 25 Sep 2024 11:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264778; bh=JytCpwE5SrfXmnVBZL4CFtCh/V2KHj1wRYRjKSzfJQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzHp9P5hAM0c/++OlIhD16nEZO0qhI0Ry1ubzTgcd6YwFGsp7G3/vJBAxV6vPcbvy dOt32ewnNfbWA8QtyOIIx95xIpZhEFKNUQZ/zWqHbU3ME1rDTvte5Q6TsyJyOX0X3N IC0N7wWARXfquWwj7NNr4WG/OTxSS9HhXyPc7Q1r2bOo+1KjKlNlAWMlFfR8jE1miv Uuiu3FiYKvBnYkpqAAImYbIga4PzKOyahqOqWMrw9qnpsiuCky/xTz3Gj4bx8SX81h s1cbLtVUIvCmqKHXXFIl3af0zLXEn3ldiowy9dPGMQ5gF7/91oAJrG93Ljf/OkZ7/6 cx3biL61FUbyw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Tom Chung , Rodrigo Siqueira , Roman Li , Alex Hung , Aurabindo Pillai , Harry Wentland , Hamza Mahfooz , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, wenjing.liu@amd.com, alvin.lee2@amd.com, george.shen@amd.com, dillon.varone@amd.com, gabe.teeger@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 151/244] drm/amd/display: Handle null 'stream_status' in 'planes_changed_for_existing_stream' Date: Wed, 25 Sep 2024 07:26:12 -0400 Message-ID: <20240925113641.1297102-151-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: 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.11 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit 8141f21b941710ecebe49220b69822cab3abd23d ] This commit adds a null check for 'stream_status' in the function 'planes_changed_for_existing_stream'. Previously, the code assumed 'stream_status' could be null, but did not handle the case where it was actually null. This could lead to a null pointer dereference. Reported by smatch: drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:3784 planes_changed_for_existing_stream() error: we previously assumed 'stream_status' could be null (see line 3774) Cc: Tom Chung Cc: Rodrigo Siqueira Cc: Roman Li Cc: Alex Hung Cc: Aurabindo Pillai Cc: Harry Wentland Cc: Hamza Mahfooz Signed-off-by: Srinivasan Shanmugam Reviewed-by: Tom Chung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index bcb5267b5a6bc..67794497457d3 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -3771,8 +3771,10 @@ static bool planes_changed_for_existing_stream(struct dc_state *context, } } - if (!stream_status) + if (!stream_status) { ASSERT(0); + return false; + } for (i = 0; i < set_count; i++) if (set[i].stream == stream) -- 2.43.0