xserver: Branch 'master'

[GitLab Mirror]

 dri3/dri3_request.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 086c2e3de55bbf0cbc1d97f7dc2db70a7f5e69e3
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jan 14 12:42:00 2019 -0500

    dri3: Fix XACE access mode for open and get_supported_modifiers
    
    Neither opening a screen nor querying its modifiers confers the right to
    attach the buffer for any particular pixmap. GetAttr seems more correct.
    
    Fixes: xorg/xserver#550

diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index e34bebedb..958877efa 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -135,7 +135,7 @@ proc_dri3_open(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI3OpenReq);
 
-    status = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixReadAccess);
+    status = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);
     if (status != Success)
         return status;
 
@@ -365,7 +365,7 @@ proc_dri3_get_supported_modifiers(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI3GetSupportedModifiersReq);
 
-    status = dixLookupWindow(&window, stuff->window, client, DixReadAccess);
+    status = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
     if (status != Success)
         return status;
     pScreen = window->drawable.pScreen;