Commit df4aaf01 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Daniel Vetter
Browse files

drm/shmem-helper: Add missing vunmap on error 



The vmapping of dma-buf may succeed, but DRM SHMEM rejects the IOMEM
mapping, and thus, drm_gem_shmem_vmap_locked() should unvmap the IOMEM
before erroring out.

Cc: stable@vger.kernel.org
Fixes: 49a3f51d ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends")
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220630200058.1883506-2-dmitry.osipenko@collabora.com
parent 6f2c8d5f

drivers/gpu/drm/drm_gem_shmem_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, 
		ret = dma_buf_vmap(obj->import_attach->dmabuf, map);

		if (!ret) {

			if (WARN_ON(map->is_iomem)) {

				dma_buf_vunmap(obj->import_attach->dmabuf, map);

				ret = -EIO;

				goto err_put_pages;

			}