From: Jonas Karlman <jonas@kwiboo.se>
To: Sandy Huang <hjc@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Andy Yan <andy.yan@rock-chips.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Rob Herring <robh@kernel.org>
Cc: Mark Yao <markyao0591@gmail.com>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Jonas Karlman <jonas@kwiboo.se>
Subject: [PATCH 3/4] drm/rockchip: vop2: Don't crash for invalid duplicate_state
Date: Tue, 20 Jun 2023 06:47:38 +0000 (UTC) [thread overview]
Message-ID: <20230620064732.1525594-4-jonas@kwiboo.se> (raw)
In-Reply-To: <20230620064732.1525594-1-jonas@kwiboo.se>
It's possible for users to try to duplicate the CRTC state even when the
state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other
users of __drm_atomic_helper_crtc_duplicate_state()) already guard this
with a WARN_ON() instead of crashing, so let's do that here too.
Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index ca73b8ccc29f..f725487d02ef 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2099,11 +2099,13 @@ static void vop2_crtc_reset(struct drm_crtc *crtc)
static struct drm_crtc_state *vop2_crtc_duplicate_state(struct drm_crtc *crtc)
{
- struct rockchip_crtc_state *vcstate, *old_vcstate;
+ struct rockchip_crtc_state *vcstate;
- old_vcstate = to_rockchip_crtc_state(crtc->state);
+ if (WARN_ON(!crtc->state))
+ return NULL;
- vcstate = kmemdup(old_vcstate, sizeof(*old_vcstate), GFP_KERNEL);
+ vcstate = kmemdup(to_rockchip_crtc_state(crtc->state),
+ sizeof(*vcstate), GFP_KERNEL);
if (!vcstate)
return NULL;
--
2.41.0
next prev parent reply other threads:[~2023-06-20 6:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 6:47 [PATCH 0/4] drm/rockchip: Fix crtc duplicate state and crtc reset funcs Jonas Karlman
2023-06-20 6:47 ` [PATCH 1/4] drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs Jonas Karlman
2023-06-21 8:05 ` Sascha Hauer
2023-06-20 6:47 ` [PATCH 2/4] drm/rockchip: vop: Use cleanup helper directly as destroy funcs Jonas Karlman
2023-06-21 8:05 ` Sascha Hauer
2023-06-20 6:47 ` Jonas Karlman [this message]
2023-06-21 8:06 ` [PATCH 3/4] drm/rockchip: vop2: Don't crash for invalid duplicate_state Sascha Hauer
2023-06-20 6:47 ` [PATCH 4/4] drm/rockchip: vop2: Add missing call to crtc reset helper Jonas Karlman
2023-06-21 8:11 ` Sascha Hauer
2023-06-21 15:41 ` Jonas Karlman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230620064732.1525594-4-jonas@kwiboo.se \
--to=jonas@kwiboo.se \
--cc=airlied@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=markyao0591@gmail.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®