From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F784CCF9FE for ; Mon, 3 Nov 2025 12:47:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3E4410E3DC; Mon, 3 Nov 2025 12:47:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="pUnAt2vc"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9486510E3E3 for ; Mon, 3 Nov 2025 12:47:31 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 9D380600B0; Mon, 3 Nov 2025 12:47:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13327C4CEFD; Mon, 3 Nov 2025 12:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762174050; bh=6mGgl52IcVIKbbdqOyq7czHoo45cmyuoonWeI0P8oFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pUnAt2vcxyOV29MxztHKVtc42LmUQPdjqF86aVPG81MeWF2mzSEfENqOZnZEALSAZ iXRH+Ugoj9BTXA+o2wOq51/wR9Vbj4MnboCj2hicN1zZP+3A3nW3JMhtpmm57qxAo9 LmNC1miL78ApY+VmyoAU2JzD1fBhDwQxAWeqRA75rBXE4+BNgl7E/z44ehDMCfVVi/ go1WZAoyxwgiuZpzDcqqwQadWzr/8HOdFruQ+8xskJj2+jiDWb/kPabRci4Epad0od kFuoJwy09UwUR+fF6YD8f5hMHsmfOsd3E/4ucmxY4FcvRXgQXGS4J6E6ABwmE+fzhu IGtfU+zUPbrgQ== 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.6.y] drm/sysfb: Do not dereference NULL pointer in plane reset Date: Mon, 3 Nov 2025 07:47:27 -0500 Message-ID: <20251103124727.4003872-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025110310-heavily-unsavory-7385@gregkh> References: <2025110310-heavily-unsavory-7385@gregkh> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 5d4b9cd077f7a..e0ea3c661cb77 100644 --- a/drivers/gpu/drm/drm_gem_atomic_helper.c +++ b/drivers/gpu/drm/drm_gem_atomic_helper.c @@ -301,7 +301,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