drm: Fix an unwanted master inheritance v2
Subsystems (3)
PATCH 1/1 drm: Fix an unwanted master inheritance v2
A client calling drmSetMaster() using a file descriptor that was opened when another client was master would inherit the latter client's master object and all its authenticated clients.
This is unwanted behaviour, and when this happens, instead allocate a brand new master object for the client calling drmSetMaster().
Fixes a BUG() throw in vmw_master_set().
--- drivers/gpu/drm/drm_drv.c | 5 +++ drivers/gpu/drm/drm_fops.c | 84 ++++++++++++++++++++++++++++++---------------- include/drm/drmP.h | 6 ++++ 3 files changed, 67 insertions(+), 28 deletions(-)
drivers/gpu/drm/drm_drv.c +5 -0
@@ -160,6 +160,11 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, goto out_unlock; } +if (!file_priv->allowed_master) { + ret =drm_new_set_master (dev, file_priv); + goto out_unlock; + } + file_priv->minor->master =drm_master_get (file_priv->master); file_priv->is_master =1 ;if (dev->driver->master_set) {
drivers/gpu/drm/drm_fops.c +56 -28
97 lines not on this page · raw message
include/drm/drmP.h +6 -0
@@ -309,6 +309,11 @@ struct drm_file { unsigned universal_planes:1;/* true if client understands atomic properties */ unsigned atomic:1; +/* +* This client is allowed to gain master privileges for @master. +* Protected by struct drm_device::master_mutex. +*/ + unsigned allowed_master:1;struct pid *pid;kuid_t uid;
@@ -910,6 +915,7 @@ extern int drm_open(struct inode *inode, struct file *filp);extern ssize_t drm_read (struct file *filp,char __user *buffer,size_t count,loff_t *offset);extern int drm_release (struct inode *inode,struct file *filp); +extern int drm_new_set_master (struct drm_device *dev,struct drm_file *fpriv);/* Mapping support (drm_vm.h) */ extern unsigned int drm_poll (struct file *filp,struct poll_table_struct *wait);
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Thomas Hellstrom
A client calling
drmSetMaster()using a file descriptor that was opened when another client was master would inherit the latter client's master object and all its authenticated clients.This is unwanted behaviour, and when this happens, instead allocate a brand new master object for the client calling
drmSetMaster().Fixes a
BUG()throw invmw_master_set().Cc <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Drive-by bikeshedding, the actual change might look neater (and easier to revert if something falls apart) if you extracted the drm_new_set_master() abstraction as a separate non-functional prep patch. Not insisting, just a thought.
BR,
Jani.
Quoted 149 lines
--- drivers/gpu/drm/drm_drv.c | 5 +++ drivers/gpu/drm/drm_fops.c | 84 ++++++++++++++++++++++++++++++---------------- include/drm/drmP.h | 6 ++++ 3 files changed, 67 insertions(+), 28 deletions(-)drivers/gpu/drm/drm_drv.c +5
-0@@ -160,6 +160,11 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, goto out_unlock; } +if (!file_priv->allowed_master) { + ret =drm_new_set_master (dev, file_priv); + goto out_unlock; + } + file_priv->minor->master =drm_master_get (file_priv->master); file_priv->is_master =1 ;if (dev->driver->master_set) {drivers/gpu/drm/drm_fops.c +56
-28@@ -126,6 +126,60 @@ static int drm_cpu_valid(void) }/** +* drm_new_set_master - Allocate a new master object and become master for the +* associated master realm. +* +* @dev: The associated device. +* @fpriv: File private identifying the client. +* +* This function must be called with dev::struct_mutex held. +* Returns negative error code on failure. Zero on success. +*/ +int drm_new_set_master (struct drm_device *dev,struct drm_file *fpriv) +{ +struct drm_master *old_master; +int ret; + +lockdep_assert_held_once (&dev->master_mutex); + +/* create a new master */ + fpriv->minor->master =drm_master_create (fpriv->minor); +if (!fpriv->minor->master) +return -ENOMEM ; + +/* take another reference for the copy in the local file priv */ + old_master = fpriv->master; + fpriv->master =drm_master_get (fpriv->minor->master); + +if (dev->driver->master_create) { + ret = dev->driver->master_create (dev, fpriv->master); +if (ret) + goto out_err; + } +if (dev->driver->master_set) { + ret = dev->driver->master_set (dev, fpriv, true); +if (ret) + goto out_err; + } + + fpriv->is_master =1 ; + fpriv->allowed_master =1 ; + fpriv->authenticated =1 ; +if (old_master) +drm_master_put (&old_master); + +return 0 ; + +out_err: +/* drop both references and restore old master on failure */ +drm_master_put (&fpriv->minor->master); +drm_master_put (&fpriv->master); + fpriv->master = old_master; + +return ret; +} + +/** * Called whenever a process opens /dev/drm. * * \param filp file pointer. @@ -189,35 +243,9 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)mutex_lock (&dev->master_mutex);if (drm_is_primary_client (priv) && !priv->minor->master) {/* create a new master */ - priv->minor->master =drm_master_create (priv->minor); -if (!priv->minor->master) { - ret = -ENOMEM ; + ret =drm_new_set_master (dev, priv); +if (ret) goto out_close; - } - - priv->is_master =1 ; -/* take another reference for the copy in the local file priv */ - priv->master =drm_master_get (priv->minor->master); - priv->authenticated =1 ; - -if (dev->driver->master_create) { - ret = dev->driver->master_create (dev, priv->master); -if (ret) { -/* drop both references if this fails */ -drm_master_put (&priv->minor->master); -drm_master_put (&priv->master); - goto out_close; - } - } -if (dev->driver->master_set) { - ret = dev->driver->master_set (dev, priv, true); -if (ret) { -/* drop both references if this fails */ -drm_master_put (&priv->minor->master); -drm_master_put (&priv->master); - goto out_close; - } - } }else if (drm_is_primary_client (priv)) {/* get a reference to the master */ priv->master =drm_master_get (priv->minor->master);include/drm/drmP.h +6
-0@@ -309,6 +309,11 @@ struct drm_file { unsigned universal_planes:1;/* true if client understands atomic properties */ unsigned atomic:1; +/* +* This client is allowed to gain master privileges for @master. +* Protected by struct drm_device::master_mutex. +*/ + unsigned allowed_master:1;struct pid *pid;kuid_t uid;@@ -910,6 +915,7 @@ extern int drm_open(struct inode *inode, struct file *filp);extern ssize_t drm_read (struct file *filp,char __user *buffer,size_t count,loff_t *offset);extern int drm_release (struct inode *inode,struct file *filp); +extern int drm_new_set_master (struct drm_device *dev,struct drm_file *fpriv);/* Mapping support (drm_vm.h) */ extern unsigned int drm_poll (struct file *filp,struct poll_table_struct *wait);
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Hi,
Quoted 12 lines · Jani Nikula
Quoted 11 lines · Thomas Hellstrom
A client calling
drmSetMaster()using a file descriptor that was opened when another client was master would inherit the latter client's master object and all its authenticated clients.This is unwanted behaviour, and when this happens, instead allocate a brand new master object for the client calling
drmSetMaster().Fixes a
BUG()throw invmw_master_set().Cc <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Quoted 7 lines
Drive-by bikeshedding, the actual change might look neater (and easier to revert if something falls apart) if you extracted the
drm_new_set_master()abstraction as a separate non-functional prep patch. Not insisting, just a thought.BR,
Jani.
While you're probably right, I prefer to have this as a single patch to avoid ending up in a backporting nightmare for stable.
Thanks,
Thomas
Quoted 150 lines
Quoted 150 lines
--- drivers/gpu/drm/drm_drv.c | 5 +++ drivers/gpu/drm/drm_fops.c | 84 ++++++++++++++++++++++++++++++---------------- include/drm/drmP.h | 6 ++++ 3 files changed, 67 insertions(+), 28 deletions(-)drivers/gpu/drm/drm_drv.c +5
-0@@ -160,6 +160,11 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, goto out_unlock; } +if (!file_priv->allowed_master) { + ret =drm_new_set_master (dev, file_priv); + goto out_unlock; + } + file_priv->minor->master =drm_master_get (file_priv->master); file_priv->is_master =1 ;if (dev->driver->master_set) {drivers/gpu/drm/drm_fops.c +56
-28@@ -126,6 +126,60 @@ static int drm_cpu_valid(void) }/** +* drm_new_set_master - Allocate a new master object and become master for the +* associated master realm. +* +* @dev: The associated device. +* @fpriv: File private identifying the client. +* +* This function must be called with dev::struct_mutex held. +* Returns negative error code on failure. Zero on success. +*/ +int drm_new_set_master (struct drm_device *dev,struct drm_file *fpriv) +{ +struct drm_master *old_master; +int ret; + +lockdep_assert_held_once (&dev->master_mutex); + +/* create a new master */ + fpriv->minor->master =drm_master_create (fpriv->minor); +if (!fpriv->minor->master) +return -ENOMEM ; + +/* take another reference for the copy in the local file priv */ + old_master = fpriv->master; + fpriv->master =drm_master_get (fpriv->minor->master); + +if (dev->driver->master_create) { + ret = dev->driver->master_create (dev, fpriv->master); +if (ret) + goto out_err; + } +if (dev->driver->master_set) { + ret = dev->driver->master_set (dev, fpriv, true); +if (ret) + goto out_err; + } + + fpriv->is_master =1 ; + fpriv->allowed_master =1 ; + fpriv->authenticated =1 ; +if (old_master) +drm_master_put (&old_master); + +return 0 ; + +out_err: +/* drop both references and restore old master on failure */ +drm_master_put (&fpriv->minor->master); +drm_master_put (&fpriv->master); + fpriv->master = old_master; + +return ret; +} + +/** * Called whenever a process opens /dev/drm. * * \param filp file pointer. @@ -189,35 +243,9 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)mutex_lock (&dev->master_mutex);if (drm_is_primary_client (priv) && !priv->minor->master) {/* create a new master */ - priv->minor->master =drm_master_create (priv->minor); -if (!priv->minor->master) { - ret = -ENOMEM ; + ret =drm_new_set_master (dev, priv); +if (ret) goto out_close; - } - - priv->is_master =1 ; -/* take another reference for the copy in the local file priv */ - priv->master =drm_master_get (priv->minor->master); - priv->authenticated =1 ; - -if (dev->driver->master_create) { - ret = dev->driver->master_create (dev, priv->master); -if (ret) { -/* drop both references if this fails */ -drm_master_put (&priv->minor->master); -drm_master_put (&priv->master); - goto out_close; - } - } -if (dev->driver->master_set) { - ret = dev->driver->master_set (dev, priv, true); -if (ret) { -/* drop both references if this fails */ -drm_master_put (&priv->minor->master); -drm_master_put (&priv->master); - goto out_close; - } - } }else if (drm_is_primary_client (priv)) {/* get a reference to the master */ priv->master =drm_master_get (priv->minor->master);include/drm/drmP.h +6
-0@@ -309,6 +309,11 @@ struct drm_file { unsigned universal_planes:1;/* true if client understands atomic properties */ unsigned atomic:1; +/* +* This client is allowed to gain master privileges for @master. +* Protected by struct drm_device::master_mutex. +*/ + unsigned allowed_master:1;struct pid *pid;kuid_t uid;@@ -910,6 +915,7 @@ extern int drm_open(struct inode *inode, struct file *filp);extern ssize_t drm_read (struct file *filp,char __user *buffer,size_t count,loff_t *offset);extern int drm_release (struct inode *inode,struct file *filp); +extern int drm_new_set_master (struct drm_device *dev,struct drm_file *fpriv);
Quoted 2 lines
include/drm/drmP.h extern int drm_open(struct inode *inode, struct file *filp); · line 921
Quoted 2 lines
include/drm/drmP.h +0
-0/* Mapping support (drm_vm.h) */ extern unsigned int drm_poll (struct file *filp,struct poll_table_struct *wait);
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 20 lines · Thomas Hellstrom
Hi,
Quoted 17 lines · Jani Nikula
Quoted 11 lines · Thomas Hellstrom
A client calling
drmSetMaster()using a file descriptor that was opened when another client was master would inherit the latter client's master object and all its authenticated clients.This is unwanted behaviour, and when this happens, instead allocate a brand new master object for the client calling
drmSetMaster().Fixes a
BUG()throw invmw_master_set().Cc <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>Drive-by bikeshedding, the actual change might look neater (and easier to revert if something falls apart) if you extracted the
drm_new_set_master()abstraction as a separate non-functional prep patch. Not insisting, just a thought.
Quoted 4 lines
Quoted 2 lines
BR,
Jani.While you're probably right, I prefer to have this as a single patch to avoid ending up in a backporting nightmare for stable.
That's reasonable.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 11 lines · Thomas Hellstrom
A client calling
drmSetMaster()using a file descriptor that was opened when another client was master would inherit the latter client's master object and all its authenticated clients.This is unwanted behaviour, and when this happens, instead allocate a brand new master object for the client calling
drmSetMaster().Fixes a
BUG()throw invmw_master_set().Cc <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>
Looks a lot better thanks!
Fwiw
-Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel