From 0dae5f42c0e00ce5d85be8c55199770d1fc455d9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Sep 2021 14:31:19 +0200 Subject: [PATCH] Revert "drm/vmwgfx: fix potential UAF in vmwgfx_surface.c" This reverts commit d6c91423993e8164ca4162ff046c6437bbd75b53 which is commit 2bc5da528dd570c5ecabc107e6fbdbc55974276f upstream. It was part of the drm api change that is not needed for Android devices and not reverting it was breaking the build. Fixes: b3666e45277b ("Revert "drm: protect drm_master pointers in drm_lease.c"") Signed-off-by: Greg Kroah-Hartman Change-Id: I5e526266b214116981319d2d2e2dfa442d74279f --- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index f1a51371de5b..f493b20c7a38 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -866,7 +866,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, user_srf->prime.base.shareable = false; user_srf->prime.base.tfile = NULL; if (drm_is_primary_client(file_priv)) - user_srf->master = drm_file_get_master(file_priv); + user_srf->master = drm_master_get(file_priv->master); /** * From this point, the generic resource management functions @@ -1537,7 +1537,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, user_srf = container_of(srf, struct vmw_user_surface, srf); if (drm_is_primary_client(file_priv)) - user_srf->master = drm_file_get_master(file_priv); + user_srf->master = drm_master_get(file_priv->master); ret = ttm_read_lock(&dev_priv->reservation_sem, true); if (unlikely(ret != 0))