Messages in this thread | | | Date | Tue, 9 Aug 2022 18:38:16 +0200 | From | Daniel Vetter <> | Subject | Re: [PATCH v7 1/2] drm/shmem-helper: Add missing vunmap on error |
| |
On Thu, Jun 30, 2022 at 11:00:57PM +0300, Dmitry Osipenko wrote: > 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: 49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends") > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Pushed to drm-misc-next-fixes, thanks for your patch. -Daniel
> --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 8ad0e02991ca..904fc893c905 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -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; > } > -- > 2.36.1 >
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
| |