Unverified Commit 950c74b8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12261 drm/lima: fix a memleak in lima_heap_alloc 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6BELYSYJX2OIBNHDNUAHMRZVA5NSJF5G/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q978 
 
Link:https://gitee.com/openeuler/kernel/pulls/12261

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f7dada16 2edbcaaf

drivers/gpu/drm/lima/lima_gem.c

+14 −9
Original line number Diff line number Diff line
@@ -74,29 +74,34 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima_vm *vm) 
	} else {

		bo->base.sgt = kmalloc(sizeof(*bo->base.sgt), GFP_KERNEL);

		if (!bo->base.sgt) {

			sg_free_table(&sgt);

			return -ENOMEM;

			ret = -ENOMEM;

			goto err_out0;

		}

	}



	ret = dma_map_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0);

	if (ret) {

		sg_free_table(&sgt);

		kfree(bo->base.sgt);

		bo->base.sgt = NULL;

		return ret;

	}

	if (ret)

		goto err_out1;



	*bo->base.sgt = sgt;



	if (vm) {

		ret = lima_vm_map_bo(vm, bo, old_size >> PAGE_SHIFT);

		if (ret)

			return ret;

			goto err_out2;

	}



	bo->heap_size = new_size;

	return 0;



err_out2:

	dma_unmap_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0);

err_out1:

	kfree(bo->base.sgt);

	bo->base.sgt = NULL;

err_out0:

	sg_free_table(&sgt);

	return ret;

}



int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file,