Skip to content

Commit 036d207

Browse files
committed
drm/msm: Ensure mmap offset is initialized
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the vma_node could be unitialized. This leads to a situation where the CPU mapping is not correctly torn down in drm_vma_node_unmap(). Fixes: e551655 ("drm: call drm_gem_object_funcs.mmap with fake offset") Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20220531200857.136547-1-robdclark@gmail.com
1 parent af0f2a8 commit 036d207

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = {
964964
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
965965
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
966966
.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,
967-
.gem_prime_mmap = drm_gem_prime_mmap,
967+
.gem_prime_mmap = msm_gem_prime_mmap,
968968
#ifdef CONFIG_DEBUG_FS
969969
.debugfs_init = msm_debugfs_init,
970970
#endif

drivers/gpu/drm/msm/msm_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_t
246246
void msm_gem_shrinker_init(struct drm_device *dev);
247247
void msm_gem_shrinker_cleanup(struct drm_device *dev);
248248

249+
int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
249250
struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);
250251
int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map);
251252
void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map);

drivers/gpu/drm/msm/msm_gem_prime.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@
1111
#include "msm_drv.h"
1212
#include "msm_gem.h"
1313

14+
int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
15+
{
16+
int ret;
17+
18+
/* Ensure the mmap offset is initialized. We lazily initialize it,
19+
* so if it has not been first mmap'd directly as a GEM object, the
20+
* mmap offset will not be already initialized.
21+
*/
22+
ret = drm_gem_create_mmap_offset(obj);
23+
if (ret)
24+
return ret;
25+
26+
return drm_gem_prime_mmap(obj, vma);
27+
}
28+
1429
struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
1530
{
1631
struct msm_gem_object *msm_obj = to_msm_bo(obj);

0 commit comments

Comments
 (0)