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@xxxxxxxxxx>
> Signed-off-by: Zou Wei <zou_wei@xxxxxxxxxx>
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
