Message ID | 20230620064732.1525594-4-jonas@kwiboo.se |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3481998vqr; Tue, 20 Jun 2023 00:15:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ73A3oVkeYn5iCL63KXCkqZ3NZQ9K1TEsIwuNJdnBQwYxyMZOW/qokEcgSGSFKazxTC4L+m X-Received: by 2002:a05:6a00:1914:b0:668:7494:384a with SMTP id y20-20020a056a00191400b006687494384amr7199978pfi.12.1687245303892; Tue, 20 Jun 2023 00:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687245303; cv=none; d=google.com; s=arc-20160816; b=ZPMDJ46Z74ywhVSv4+IAy184Yg17zJV73MRikYwFndouGmlAIAsWNN8+6o0qMK2lQX EMXALsc5xE/0mA7+b4eRw5/aamQmqA8MFZklmPplA7fTTx9ITc0S84+a4/3M7j2vu2uc oc0pL8ReZmfktbs+oU0aSHiHEZX1pgWaWKMVOh7JPaivHqpvkifW+6k/t0wbzILVk+NK ZiVdTDIw5h1GYgWngvHIpJvFBuN0c9ieH0KAvjhQkqE4aLxdCj5FEX1atvQyj0wLMSEI moa89RM7EBW64WmAhv8OqppHAhux8f30McjfZXe2VJQf+xXDFWzL77gqbq8PU6Ti1BGR nqrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:mime-version :references:in-reply-to:message-id:date:subject:from:dkim-signature; bh=5pbgdWNmSy9aPDMPkbL8AbjV9U0EnRo0+ZChKli6JfM=; b=wRs2bJSRh/CvYQSFiC4XCVGTSKEhzLJYSSUp2cEUmbKpMl40Sds1Ea+owMVo6iiA5y jmjS6vOjRWaBVrE/PMXufPpoxxCBE5sTVRULMVYYS69n3GOv1Snd+ed69ueo0HrETBDF iWB5dUXEHAG+pU0f23v9nRVYjgANwvleoiek5yQb1JxFmrJcOX7mSlrkkW9skZ54yaI4 iANhQKp5DLg8KfZ5kKBXUmfbd4ysE/Fc+9iUronowgBYgdgT47L2Az6G4/1Bhlyx0GGj MRohueKChaul4uTePFgxyMCoNSGeAm9EHZQtQcs8po0BYmvTnkXDX9jcSRozYx/5jBM/ cDcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kwiboo.se header.s=s1 header.b=eVrS5554; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kwiboo.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020aa7842b000000b006686fe3fe4bsi1131454pfn.154.2023.06.20.00.14.52; Tue, 20 Jun 2023 00:15:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kwiboo.se header.s=s1 header.b=eVrS5554; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kwiboo.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231260AbjFTGsB (ORCPT <rfc822;duw91626@gmail.com> + 99 others); Tue, 20 Jun 2023 02:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231236AbjFTGru (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 20 Jun 2023 02:47:50 -0400 Received: from s.wrqvwxzv.outbound-mail.sendgrid.net (s.wrqvwxzv.outbound-mail.sendgrid.net [149.72.154.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4558F10E0 for <linux-kernel@vger.kernel.org>; Mon, 19 Jun 2023 23:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=5pbgdWNmSy9aPDMPkbL8AbjV9U0EnRo0+ZChKli6JfM=; b=eVrS5554pcjPfv9qQqL7hGY0jyiDvsj9RT7apUoZX0grmM3rUFRKnLhEDdf4ygOm1p1Q 0r3S4yOzh2Rqg2ol1RfyIADEiNF/f+K2skcpAAZwtoT7B9cIZe9JerudoUS5PHLLWN0lBA gwj2sQZssKqPGbWx0LdzP9ZMxjP8azYEKdVZEl78Joe+ftZF0V9buBCwNynFdPHd0FiYWZ HVq50Ln69Irhwmf5ZSzV/eUAlDJKUVOzoOEqYnTBvwJ5VIktfdqbKRKuheFxvCA6akmLvf tIJxBJrfY+FMZf0GXdg3Bw4U10ByCZcH6kXilzSMw63jIncJb96Bo5tCIvgOOQrg== Received: by filterdrecv-84b96456cb-5hl7m with SMTP id filterdrecv-84b96456cb-5hl7m-1-64914B8A-11 2023-06-20 06:47:38.471885304 +0000 UTC m=+3481762.440632816 Received: from bionic.localdomain (unknown) by geopod-ismtpd-5 (SG) with ESMTP id RoZFBd_nQNK1YqBzlZ8GTA Tue, 20 Jun 2023 06:47:38.183 +0000 (UTC) From: 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) Message-ID: <20230620064732.1525594-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230620064732.1525594-1-jonas@kwiboo.se> References: <20230620064732.1525594-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+eHmV8Nkxhx/pGei3g0n+d3x8Np2TBP3wBP6EHYLmaspDk9WVqgJCxMF3L9wcKO7JYi6qnKjNs2IVQjlFzRSo81NPeNL9PJY6OCAtf5zRwMP18IwU7G6/MJ6qiVrABZ245rV5WQ1eCrJYxs/5pJ1C0e+CwYt3KDuR/E8OGh8RM1 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> X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769204931899161651?= X-GMAIL-MSGID: =?utf-8?q?1769204931899161651?= |
Series |
drm/rockchip: Fix crtc duplicate state and crtc reset funcs
|
|
Commit Message
Jonas Karlman
June 20, 2023, 6:47 a.m. UTC
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(-)
Comments
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 <jonas@kwiboo.se> Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> 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 > >
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;