drm: Check for lessee in DROP_MASTER ioctl
Subsystems (2)
PATCH 1/1 drm: Check for lessee in DROP_MASTER ioctl
Don't let a lessee control what the current DRM master is set to; that's the job of the "real" master. Otherwise, the lessee would disable all access to master operations for the owner and all lessees under it.
This matches the same check made in the SET_MASTER ioctl.
--- drivers/gpu/drm/drm_auth.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_auth.c +6 -0
@@ -230,6 +230,12 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,if (!dev->master) goto out_unlock; +if (file_priv->master->lessor !=NULL ) { +DRM_DEBUG_LEASE ("Attempt to drop lessee %d as master\n" , file_priv->master->lessee_id); + ret = -EINVAL ; + goto out_unlock; + } + ret =0 ;drm_drop_master (dev, file_priv); out_unlock:
Signature · 1 line
2.15.1
Quoted 8 lines · Keith Packard
Don't let a lessee control what the current DRM master is set to; that's the job of the "real" master. Otherwise, the lessee would disable all access to master operations for the owner and all lessees under it.
This matches the same check made in the
SET_MASTERioctl.Signed-off-by Keith Packard <[email protected]>
Similar check for setmaster already exists, so looks all good. Do we have an igt for all this? Iirc there was one floating around, but no idea what's the status. Might also be good to resubmit them so i915 CI can run the tests (now that the code has landed).
On the patch itself, minus lack of testcases:
Quoted 24 lines
--- drivers/gpu/drm/drm_auth.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_auth.c +6
-0@@ -230,6 +230,12 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data,if (!dev->master) goto out_unlock; +if (file_priv->master->lessor !=NULL ) { +DRM_DEBUG_LEASE ("Attempt to drop lessee %d as master\n" , file_priv->master->lessee_id); + ret = -EINVAL ; + goto out_unlock; + } + ret =0 ;drm_drop_master (dev, file_priv); out_unlock:Signature · 1 line
2.15.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Daniel Vetter
Quoted 5 lines · Keith Packard
Don't let a lessee control what the current DRM master is set to; that's the job of the "real" master. Otherwise, the lessee would disable all access to master operations for the owner and all lessees under it.
Quoted 8 lines
Quoted 3 lines
This matches the same check made in the
SET_MASTERioctl.Signed-off-by Keith Packard <[email protected]>Similar check for setmaster already exists, so looks all good. Do we have an igt for all this? Iirc there was one floating around, but no idea what's the status. Might also be good to resubmit them so i915 CI can run the tests (now that the code has landed).
I've got IGT tests for leasing which have been posted to dri-devel but I don't think they've been reviewed. Looks like they could use some more test cases; I didn't catch this one until I was playing with my 'xlease' hack, which runs the X server on a leased FD.
Quoted 3 lines
On the patch itself, minus lack of testcases:
Reviewed-by Daniel Vetter <[email protected]>
Thanks!
Signature · 1 line
-keith
Quoted 17 lines · Keith Packard
Quoted 6 lines · Daniel Vetter
Quoted 5 lines · Keith Packard
Don't let a lessee control what the current DRM master is set to; that's the job of the "real" master. Otherwise, the lessee would disable all access to master operations for the owner and all lessees under it.
Quoted 8 lines
Quoted 3 lines
This matches the same check made in the
SET_MASTERioctl.Signed-off-by Keith Packard <[email protected]>Similar check for setmaster already exists, so looks all good. Do we have an igt for all this? Iirc there was one floating around, but no idea what's the status. Might also be good to resubmit them so i915 CI can run the tests (now that the code has landed).
Quoted 4 lines
I've got IGT tests for leasing which have been posted to dri-devel but I don't think they've been reviewed. Looks like they could use some more test cases; I didn't catch this one until I was playing with my 'xlease' hack, which runs the X server on a leased FD.
Can you pls resubmit (preferrably with the new nasty tests added) to [email protected] (we have a new m-l for igt stuff)?
Quoted 5 lines
Quoted 3 lines
On the patch itself, minus lack of testcases:
Reviewed-by Daniel Vetter <[email protected]>Thanks!
Realized I should better apply this, and done :-)
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel