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 F098B313E2C for ; Mon, 3 Nov 2025 14:59:14 +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=1762181956; cv=none; b=SFB4YGa+5npkpQVWc1ZYnxFNOI4E5KuPah+1Qn3kDFpt9X/JSNpZn2jGhPjANrjWu3Wqjm301aIzHFzd30aDSAxgOfP7C4ijTIiA1fa2eSICvK22ZFpcos//IdfOHGQcFQ/Sje0dS02C4lqiBP1gRFINd0SMKWnI6YFjLMZNSMM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762181956; c=relaxed/simple; bh=tJBA2A+TAE93GzGOk0Jxuu8XMEMOTtnOa9DvzJ94jGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/EnsZ59rxD/VRjHoZRTNWowmlebj968oKKsqMRl1bLepvWz+zhro3Rxu7aUFVTE7zsxJXFx4TkJKGIXWffQYc4+GBaTxApso09YSeHcUOhhMn1bW1zpYtQeBNtvbB9Lah8880O8cXZh5yEgsRtvR4rumd4nRUV0pCB8RFyH+GA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qa+X6nMS; 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="qa+X6nMS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43AB2C4CEE7; Mon, 3 Nov 2025 14:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762181954; bh=tJBA2A+TAE93GzGOk0Jxuu8XMEMOTtnOa9DvzJ94jGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qa+X6nMS46jJl35Y+sWy6EoBVNq7Rj6SNFy5ajiPzX5ThVRYDs6S0UQSFBuPYjxLY rlUNC3Md7/vM70gRvmkIUU1M0NPuY0MBD722o/bQdH8K2kbepK9Z3BbCeSX54sbtSu 7jXvw9qdvmn2JA0DSFBmWcED925SM5MGshaJvArmCvW6MAmOqD7VUvZt124DTdQE4P mGMWUGN8Udtu+x/2hwVfA7d2yriaD0W+0MCDx/S6f4MXB/Yj25ZMJvT/NJLIcbDJeK IXZNShtuwylTnz8487ts/Fl7cj2CZ6sii3vLBoEuSSUR4GY7NHt+FPmV67iLv4zXH/ TdZ9O/XE8WVVg== From: Sasha Levin To: stable@vger.kernel.org Cc: Thomas Zimmermann , Dan Carpenter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Sasha Levin Subject: [PATCH 6.1.y] drm/sysfb: Do not dereference NULL pointer in plane reset Date: Mon, 3 Nov 2025 09:59:11 -0500 Message-ID: <20251103145911.4040590-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025110312-duration-shape-5d38@gregkh> References: <2025110312-duration-shape-5d38@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thomas Zimmermann [ Upstream commit 14e02ed3876f4ab0ed6d3f41972175f8b8df3d70 ] The plane state in __drm_gem_reset_shadow_plane() can be NULL. Do not deref that pointer, but forward NULL to the other plane-reset helpers. Clears plane->state to NULL. v2: - fix typo in commit description (Javier) Signed-off-by: Thomas Zimmermann Fixes: b71565022031 ("drm/gem: Export implementation of shadow-plane helpers") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/dri-devel/aPIDAsHIUHp_qSW4@stanley.mountain/ Cc: Thomas Zimmermann Cc: Melissa Wen Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: David Airlie Cc: Simona Vetter Cc: dri-devel@lists.freedesktop.org Cc: # v5.15+ Reviewed-by: Javier Martinez Canillas Link: https://patch.msgid.link/20251017091407.58488-1-tzimmermann@suse.de [ removed drm_format_conv_state_init() call ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_gem_atomic_helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_atomic_helper.c b/drivers/gpu/drm/drm_gem_atomic_helper.c index b6a0110eb64af..2e658c216959f 100644 --- a/drivers/gpu/drm/drm_gem_atomic_helper.c +++ b/drivers/gpu/drm/drm_gem_atomic_helper.c @@ -330,7 +330,11 @@ EXPORT_SYMBOL(drm_gem_destroy_shadow_plane_state); void __drm_gem_reset_shadow_plane(struct drm_plane *plane, struct drm_shadow_plane_state *shadow_plane_state) { - __drm_atomic_helper_plane_reset(plane, &shadow_plane_state->base); + if (shadow_plane_state) { + __drm_atomic_helper_plane_reset(plane, &shadow_plane_state->base); + } else { + __drm_atomic_helper_plane_reset(plane, NULL); + } } EXPORT_SYMBOL(__drm_gem_reset_shadow_plane); -- 2.51.0