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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DDDFEB64D7 for ; Wed, 21 Jun 2023 08:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbjFUIGv (ORCPT ); Wed, 21 Jun 2023 04:06:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbjFUIGm (ORCPT ); Wed, 21 Jun 2023 04:06:42 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B66719AB for ; Wed, 21 Jun 2023 01:06:27 -0700 (PDT) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qBsqz-0008Si-6c; Wed, 21 Jun 2023 10:06:13 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qBsqy-00057C-7x; Wed, 21 Jun 2023 10:06:12 +0200 Date: Wed, 21 Jun 2023 10:06:12 +0200 From: Sascha Hauer To: Jonas Karlman Cc: Sandy Huang , Heiko Stuebner , David Airlie , Daniel Vetter , Andy Yan , Rob Herring , Mark Yao , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] drm/rockchip: vop2: Don't crash for invalid duplicate_state Message-ID: <20230621080612.GX18491@pengutronix.de> References: <20230620064732.1525594-1-jonas@kwiboo.se> <20230620064732.1525594-4-jonas@kwiboo.se> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230620064732.1525594-4-jonas@kwiboo.se> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 20, 2023 at 06:47:38AM +0000, Jonas Karlman wrote: > 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 Reviewed-by: Sascha Hauer Sascha > --- > 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 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |