|
 |
ff70199 |
From a19afebb883f2a02ecf4b8d5a114ce6957a59238 Mon Sep 17 00:00:00 2001
|
|
|
ff70199 |
From: Thomas Hellstrom <thellstrom@vmware.com>
|
|
|
ff70199 |
Date: Wed, 26 Aug 2015 05:49:21 -0700
|
|
|
ff70199 |
Subject: [PATCH 2/2] drm/vmwgfx: Allow dropped masters render-node like access
|
|
|
ff70199 |
on legacy nodes v2
|
|
|
ff70199 |
|
|
|
ff70199 |
Applications like gnome-shell may try to render after dropping master
|
|
|
ff70199 |
privileges. Since the driver should now be safe against this scenario,
|
|
|
ff70199 |
allow those applications to use their legacy node like a render node.
|
|
|
ff70199 |
|
|
|
ff70199 |
v2: Add missing return statement.
|
|
|
ff70199 |
|
|
|
ff70199 |
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
|
ff70199 |
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
|
|
|
ff70199 |
---
|
|
|
ff70199 |
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 ++++++-
|
|
|
ff70199 |
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 ++++++
|
|
|
ff70199 |
2 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
ff70199 |
|
|
|
ff70199 |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
|
|
|
ff70199 |
index a4766acd0ea2..d022b509f1ac 100644
|
|
|
ff70199 |
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
|
|
|
ff70199 |
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
|
|
|
ff70199 |
@@ -993,10 +993,15 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev,
|
|
|
ff70199 |
}
|
|
|
ff70199 |
|
|
|
ff70199 |
/*
|
|
|
ff70199 |
- * Check if we were previously master, but now dropped.
|
|
|
ff70199 |
+ * Check if we were previously master, but now dropped. In that
|
|
|
ff70199 |
+ * case, allow at least render node functionality.
|
|
|
ff70199 |
*/
|
|
|
ff70199 |
if (vmw_fp->locked_master) {
|
|
|
ff70199 |
mutex_unlock(&dev->master_mutex);
|
|
|
ff70199 |
+
|
|
|
ff70199 |
+ if (flags & DRM_RENDER_ALLOW)
|
|
|
ff70199 |
+ return NULL;
|
|
|
ff70199 |
+
|
|
|
ff70199 |
DRM_ERROR("Dropped master trying to access ioctl that "
|
|
|
ff70199 |
"requires authentication.\n");
|
|
|
ff70199 |
return ERR_PTR(-EACCES);
|
|
|
ff70199 |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
|
|
|
ff70199 |
index 4d0c98edeb6a..7fc3e8abd0c4 100644
|
|
|
ff70199 |
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
|
|
|
ff70199 |
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
|
|
|
ff70199 |
@@ -906,6 +906,12 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv,
|
|
|
ff70199 |
"surface reference.\n");
|
|
|
ff70199 |
return -EACCES;
|
|
|
ff70199 |
}
|
|
|
ff70199 |
+ if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) {
|
|
|
ff70199 |
+ DRM_ERROR("Locked master refused legacy "
|
|
|
ff70199 |
+ "surface reference.\n");
|
|
|
ff70199 |
+ return -EACCES;
|
|
|
ff70199 |
+ }
|
|
|
ff70199 |
+
|
|
|
ff70199 |
handle = u_handle;
|
|
|
ff70199 |
}
|
|
|
ff70199 |
|
|
|
ff70199 |
--
|
|
|
ff70199 |
2.4.3
|
|
|
ff70199 |
|