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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30634C433C1 for ; Wed, 24 Mar 2021 02:28:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 028D2619F6 for ; Wed, 24 Mar 2021 02:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231864AbhCXC2V (ORCPT ); Tue, 23 Mar 2021 22:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbhCXC1z (ORCPT ); Tue, 23 Mar 2021 22:27:55 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 501F9C061763; Tue, 23 Mar 2021 19:27:55 -0700 (PDT) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 94871580; Wed, 24 Mar 2021 03:27:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1616552873; bh=c7+kEyIoAOQeyLvRmP4n95GhCtkq6avlgEpmeNUVx18=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ih6A+94tDhI+I/348blbo/dUK/GbIo+4SUix7Ko8e0QSqbrHe5FxtM2V4tqmHEcSS lLnU8FwudbI95WD7HXoZrRuAU/ej2ItJWN8o/g23UwsmS2/BBhzv+A/EX4VbCd6xCb nQlEoqC8o/t6QtgW4AIhsTLtfYtRUh7NPIkxHDtM= Date: Wed, 24 Mar 2021 04:27:11 +0200 From: Laurent Pinchart To: Paul Cercueil Cc: David Airlie , Daniel Vetter , linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, od@zcrc.me, stable@vger.kernel.org, Sam Ravnborg Subject: Re: [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders Message-ID: References: <20210124085552.29146-1-paul@crapouillou.net> <20210124085552.29146-4-paul@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210124085552.29146-4-paul@crapouillou.net> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, Thank you for the patch. On Sun, Jan 24, 2021 at 08:55:51AM +0000, Paul Cercueil wrote: > Since the encoders have been devm-allocated, they will be freed way > before drm_mode_config_cleanup() is called. To avoid use-after-free > conditions, we then must ensure that drm_encoder_cleanup() is called > before the encoders are freed. > > v2: Use the new __drmm_simple_encoder_alloc() function > > v3: Use the new drmm_plain_simple_encoder_alloc() macro > > Fixes: c369cb27c267 ("drm/ingenic: Support multiple panels/bridges") > Cc: # 5.8+ > Signed-off-by: Paul Cercueil Reviewed-by: Laurent Pinchart > --- > > Notes: > Use the V1 of this patch to fix v5.11 and older kernels. This V3 only > applies on the current drm-misc-next branch. > > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index 7bb31fbee29d..b23011c1c5d9 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -1014,20 +1014,17 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > bridge = devm_drm_panel_bridge_add_typed(dev, panel, > DRM_MODE_CONNECTOR_DPI); > > - encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); > - if (!encoder) > - return -ENOMEM; > + encoder = drmm_plain_simple_encoder_alloc(drm, DRM_MODE_ENCODER_DPI); > + if (IS_ERR(encoder)) { > + ret = PTR_ERR(encoder); > + dev_err(dev, "Failed to init encoder: %d\n", ret); > + return ret; > + } > > encoder->possible_crtcs = 1; > > drm_encoder_helper_add(encoder, &ingenic_drm_encoder_helper_funcs); > > - ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DPI); > - if (ret) { > - dev_err(dev, "Failed to init encoder: %d\n", ret); > - return ret; > - } > - > ret = drm_bridge_attach(encoder, bridge, NULL, 0); > if (ret) { > dev_err(dev, "Unable to attach bridge\n"); -- Regards, Laurent Pinchart