xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

 Xext/sync.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5ca3a95135d9c89753e2af19da5a2615ea2be1c3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Mar 21 18:08:35 2024 -0700

    Xext: SProcSyncCreateFence needs to swap drawable id too
    
    Otherwise it causes the server to return BadDrawable giving a
    byte-swapped resource id instead of the real id the client sent.
    
    Reported-by: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69762
    Fixes: 397dfd9f8 ("Create/Destroy/Trigger/Reset/Query Fence Sync objs")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    ---
    (cherry picked from commit e6573baa7d99a77f44229b9a96a41bbda57e2387)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1438>

diff --git a/Xext/sync.c b/Xext/sync.c
index fd2ceb042..661d345e4 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2318,6 +2318,7 @@ SProcSyncCreateFence(ClientPtr client)
     REQUEST(xSyncCreateFenceReq);
     swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xSyncCreateFenceReq);
+    swapl(&stuff->d);
     swapl(&stuff->fid);
 
     return ProcSyncCreateFence(client);