diff options
| author | Brian Norris <briannorris@chromium.org> | 2022-06-17 17:26:52 -0700 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2022-07-02 12:50:01 +0200 |
| commit | 1449110b0dade8b638d2c17ab7c5b0ff696bfccb (patch) | |
| tree | 21fc2e5fa50a61c78626e065706b24d8a29aafbd /drivers/gpu/drm/rockchip | |
| parent | 5cd561688b3e8a248fdbb37a1b10801b06736865 (diff) | |
| download | linux-1449110b0dade8b638d2c17ab7c5b0ff696bfccb.tar.gz linux-1449110b0dade8b638d2c17ab7c5b0ff696bfccb.tar.bz2 linux-1449110b0dade8b638d2c17ab7c5b0ff696bfccb.zip | |
drm/rockchip: vop: Don't crash for invalid duplicate_state()
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: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid
Diffstat (limited to 'drivers/gpu/drm/rockchip')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 82b011dce5e7..ad3958b6f8bf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1572,6 +1572,9 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) { struct rockchip_crtc_state *rockchip_state; + if (WARN_ON(!crtc->state)) + return NULL; + rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); if (!rockchip_state) return NULL; |