Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 19 May 2021 12:21:41 +0200
From:   Daniel Vetter <daniel@ffwll.ch>
To:     Zou Wei <zou_wei@huawei.com>
Cc:     maarten.lankhorst@linux.intel.com, mripard@kernel.org,
        tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch,
        joseph.kogut@gmail.com, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] drm: Fix missing unlock and free on error in
 drm_legacy_addbufs_pci()
Message-ID: <YKTmta3l0barePvJ@phenom.ffwll.local>
Mail-Followup-To: Zou Wei <zou_wei@huawei.com>,
        maarten.lankhorst@linux.intel.com, mripard@kernel.org,
        tzimmermann@suse.de, airlied@linux.ie, joseph.kogut@gmail.com,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <1621341302-112089-1-git-send-email-zou_wei@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1621341302-112089-1-git-send-email-zou_wei@huawei.com>
Precedence: bulk

On Tue, May 18, 2021 at 08:35:02PM +0800, Zou Wei wrote:
> Add the missing unlock and free before return from function
> drm_legacy_addbufs_pci() in the error handling case.
> 
> Fixes: 70556e24e18e ("drm: remove usage of drm_pci_alloc/free")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zou Wei <zou_wei@huawei.com>

Applied to drm-misc-next, thanks for your patch.
-Daniel

> ---
>  drivers/gpu/drm/drm_bufs.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
> index 4805726..c23d7f7 100644
> --- a/drivers/gpu/drm/drm_bufs.c
> +++ b/drivers/gpu/drm/drm_bufs.c
> @@ -984,8 +984,16 @@ int drm_legacy_addbufs_pci(struct drm_device *dev,
>  
>  	while (entry->buf_count < count) {
>  		dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
> -		if (!dmah)
> +		if (!dmah) {
> +			/* Set count correctly so we free the proper amount. */
> +			entry->buf_count = count;
> +			entry->seg_count = count;
> +			drm_cleanup_buf_error(dev, entry);
> +			kfree(temp_pagelist);
> +			mutex_unlock(&dev->struct_mutex);
> +			atomic_dec(&dev->buf_alloc);
>  			return -ENOMEM;
> +		}
>  
>  		dmah->size = total;
>  		dmah->vaddr = dma_alloc_coherent(dev->dev,
> -- 
> 2.6.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch