Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cb207e4 authored by Dan Carpenter's avatar Dan Carpenter Committed by Thierry Reding
Browse files

drm/tegra: gem: oops in error handling 



kfree(ERR_PTR(-ENOMEM)) will not work very well.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 8643bc6d

drivers/gpu/drm/tegra/gem.c

+2 −3
Original line number Diff line number Diff line
@@ -214,10 +214,8 @@ static int tegra_bo_get_pages(struct drm_device *drm, struct tegra_bo *bo) 
	for_each_sg(sgt->sgl, s, sgt->nents, i)

		sg_dma_address(s) = sg_phys(s);



	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0) {

		sgt = ERR_PTR(-ENOMEM);

	if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0)

		goto release_sgt;

	}



	bo->sgt = sgt;
@@ -226,6 +224,7 @@ static int tegra_bo_get_pages(struct drm_device *drm, struct tegra_bo *bo) 
release_sgt:

	sg_free_table(sgt);

	kfree(sgt);

	sgt = ERR_PTR(-ENOMEM);

put_pages:

	drm_gem_put_pages(&bo->gem, bo->pages, false, false);

	return PTR_ERR(sgt);