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 313433590B2; Wed, 3 Dec 2025 16:21:05 +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=1764778865; cv=none; b=HYtDO4xo7Z27EzgFEVcZMR2RemFDXMpZHmrGpvBE19/PSfUOJa9qRR8RK+iMBC77UchTTm++z1AAYcDD8EGoH0I4ievuU2i+iisrgSNXTxDYxN7DvecJZzj8aVKL+EipOtLMl1fyCIMpQIq/LEf9fSqDQH82ENG0Y2jWJ+cmAH8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778865; c=relaxed/simple; bh=nRZWo95fAkG4NI9TX/fZYVVAtRMa1t0L5PAyUEOxsbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KIuLHJiFhtnV4/PYIzjPuMBkTI2d6JiKoqnrqmWca5TJMAC+ppuHsrEFOoMUBQqFQtnWGNQnoi1aBLWXRPjLxoPcboM1OgXX8vU2qsRn5S3THlk3ULJC/7jG2fNOTO53m9yMxzZqCw3kQme/gsGu90TEvZUi3SBY2iuu80i9uLA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GurQpm2H; 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="GurQpm2H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 698CEC4CEF5; Wed, 3 Dec 2025 16:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778865; bh=nRZWo95fAkG4NI9TX/fZYVVAtRMa1t0L5PAyUEOxsbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GurQpm2HOnEZdjdKoPEuQV8TIUzY2ch30lkhQIZXc88DuT3C8ABlepVMYB/ZeY5ne 5uRvdugEkHVE6UbH5aNREYnf2nQM+FmFdXHN2zeysAHo+vAR1vDyGHJdfDxZ2wrUjc fzWsyAxVSLT4xRsw2PVclLu+vpjHj+EeKa8z1Et4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, 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 084/568] drm/sysfb: Do not dereference NULL pointer in plane reset Date: Wed, 3 Dec 2025 16:21:26 +0100 Message-ID: <20251203152443.811067294@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_gem_atomic_helper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- 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_pla 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);