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 9C56BC54EBE for ; Sun, 8 Jan 2023 22:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233158AbjAHWp3 (ORCPT ); Sun, 8 Jan 2023 17:45:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233652AbjAHWpJ (ORCPT ); Sun, 8 Jan 2023 17:45:09 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51F8B10051 for ; Sun, 8 Jan 2023 14:45:07 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id bq39so10428192lfb.0 for ; Sun, 08 Jan 2023 14:45:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=xNjDFq7jF6Xutyrz7TZXPQsfgSYhgyOTeZIcCQictVc=; b=e8zj826Zagy7Wr+2jC7vyR1XimbGVyk4hS7mMWuWs5jS5BMhe4INZZPZZ3dqZGd4zW vVuWxQoKEM2XVg1AJ1pcgxxZxdOmVRvTv6n/91dmCmyvQWOCv4w0hTImVuK4BUK86s0O KIsslORjq5lajLYSh379zvq7zEUKgf0Wx2NeMGPciJ/W/W3IS6b0ICpuHi1WlLXLMQRH P2ZwoeLK3bIf0AE1GtJdSaO4K/qofXQUK/AihEXhvsbAow2S5HtG3N558XOuEXrTX2h+ bFCWrkB2ARluw63iPTDc17QjyIKCcm7vZy1eGqwWusrs7OooTfKMoVqVarn+L5fLGiwo bR0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xNjDFq7jF6Xutyrz7TZXPQsfgSYhgyOTeZIcCQictVc=; b=OtBE5fvDgNf7uWG0rc0RLBG0VZQV3O9v9NR2FcmUxfmVcM8K64ODkGooygG2ccJFGv pPg27Kb4bJZYRbUVXYfuvcYQY1Wgld9VirH0I3hP1zB3f6/Lo/4XL0S8Yz0+jRforAXE DYc/FQAadZLfbBB4Kx3Jv805HOXQ+QYu8gfb6RBMb5rKlk63hMlnZD0xhauhs76VvCYh O64GPDJaZYKHdwvpI2UDKQIwHcHlarEeFA5jK9vHJNlyfSR6s3GmtpZy80eAh5gqGH2B tCJKhfzMem9g7TtIGsI5tvkhLHrFvi11m77f0H/CcGMxpl66B/42WzYOM0cdxrn+qgr0 Ga0g== X-Gm-Message-State: AFqh2kry98wkL4QNlH3DCL8IGG+W3iueACH/1eX7q89V6nTotkiFBTCU nb3wRSSX+d1UYpoF24e5iyLO2g== X-Google-Smtp-Source: AMrXdXvwzFkEAxmdB2Z6hlU44qt3jw6D5B4obR6CvQwIXBWaGQgM0nax26AbcjwKQIqDWuaHbP3Z5g== X-Received: by 2002:a05:6512:304a:b0:4b5:5098:e6f7 with SMTP id b10-20020a056512304a00b004b55098e6f7mr19827844lfb.68.1673217905625; Sun, 08 Jan 2023 14:45:05 -0800 (PST) Received: from ?IPV6:2001:14ba:a085:4d00::8a5? (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id n26-20020a05651203fa00b0049464d89e40sm1257366lfq.72.2023.01.08.14.45.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Jan 2023 14:45:05 -0800 (PST) Message-ID: <9b53d5f0-e1b1-1ecd-b9b9-efa20b11c916@linaro.org> Date: Mon, 9 Jan 2023 00:45:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH RESEND] drm/msm: Add missing check and destroy for alloc_ordered_workqueue Content-Language: en-GB To: Jiasheng Jiang , robdclark@gmail.com, quic_abhinavk@quicinc.com, sean@poorly.run, airlied@gmail.com, sumit.semwal@linaro.org, christian.koenig@amd.com Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, freedreno@lists.freedesktop.org References: <20230106084712.29675-1-jiasheng@iscas.ac.cn> From: Dmitry Baryshkov In-Reply-To: <20230106084712.29675-1-jiasheng@iscas.ac.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/01/2023 10:47, Jiasheng Jiang wrote: > Add check for the return value of alloc_ordered_workqueue as it may return > NULL pointer. > Moreover, use the destroy_workqueue in the later fails in order to avoid > memory leak. > > Fixes: c8afe684c95c ("drm/msm: basic KMS driver for snapdragon") > Signed-off-by: Jiasheng Jiang > --- > drivers/gpu/drm/msm/msm_drv.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 8b0b0ac74a6f..b82d938226ad 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -418,6 +418,8 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) > priv->dev = ddev; > > priv->wq = alloc_ordered_workqueue("msm", 0); > + if (!priv->wq) > + return -ENOMEM; > > INIT_LIST_HEAD(&priv->objects); > mutex_init(&priv->obj_lock); > @@ -440,12 +442,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) > > ret = msm_init_vram(ddev); > if (ret) > - return ret; > + goto err_destroy_workqueue; > > /* Bind all our sub-components: */ > ret = component_bind_all(dev, ddev); > if (ret) > - return ret; > + goto err_destroy_workqueue; > > dma_set_max_seg_size(dev, UINT_MAX); > > @@ -540,6 +542,8 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) > > err_msm_uninit: > msm_drm_uninit(dev); return ret is missing here. Your code will result in double free. However the intent was to unroll each and every action of msm_drm_init() in msm_drm_uninit(). So in all your cases please goto err_msm_unit. > +err_destroy_workqueue: > + destroy_workqueue(priv->wq); > return ret; > } > -- With best wishes Dmitry