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 E0C831DE89A; Tue, 8 Oct 2024 12:21:59 +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=1728390120; cv=none; b=AVpE7YaIcu+oQ39UXxjxa7hw83prk+CgEjlNP7kIo4iHdbjvw3rQ+He5rf1m3h/A4970i5kHdL8+ML8C0zcYJ6ax7Q+PmgGEHfMmz26LFW2g+8o/ZdTAE8xIxrOW0Rf++VLPXkDksXAUpzzkGcn+ILXCwBZ4tGh87N7SbFGYKlE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728390120; c=relaxed/simple; bh=UysjWp6l0tVM+pFP7Ep59tCkIHfCtKZ/M8e8l1FBrls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NbZ6RJztc13kY7skWXNbHI4C8vclyFakYUODOIQpTZsbcbW3ldt+LjVDtLF8uP0SLmUprk/UtuvcyJQbW03zrFXxZWr13RGXwVDT6fJhNxAJ9uAn8kBkIYVaVZETaTRQIE/oAAlwCNe/RC9pYyrrxHhlLKwDT98PNKX7xDI7Me8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=A8Q+FErr; 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="A8Q+FErr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F37FC4CEC7; Tue, 8 Oct 2024 12:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728390119; bh=UysjWp6l0tVM+pFP7Ep59tCkIHfCtKZ/M8e8l1FBrls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8Q+FErrhJAyZP8uc0JOMrshJXLD7j1yatqP2j/qLJBc51KaAqUtT9WOpEHXf+1C8 qAcpHPln8WiRMQYB4ZHOvTbjCoJmzOs8PiK8rL3BmIv/FLvMMOfmUP10p4hWL3RHEl 0woX8978aCp9xXfZp1aCJ0UON+4zVodPDHLbrpUw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tom Chung , Rodrigo Siqueira , Roman Li , Alex Hung , Aurabindo Pillai , Harry Wentland , Hamza Mahfooz , Srinivasan Shanmugam , Alex Deucher , Sasha Levin Subject: [PATCH 6.10 189/482] drm/amd/display: Handle null stream_status in planes_changed_for_existing_stream Date: Tue, 8 Oct 2024 14:04:12 +0200 Message-ID: <20241008115655.742120968@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: 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 786b56e96a816..7462c34793799 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -3662,8 +3662,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