xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-screen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb33e0d27892b885b0d86b5f99af2b71f660de56
Author: Demi Marie Obenour <demiobenour at gmail.com>
Date:   Sat Oct 8 15:39:39 2022 -0400

    Forbid server grabs by non-WM on *rootless* XWayland
    
    a77d95af61c09c91927d1aa4b9860b728b357cdb intended to do this, but the
    check for “is this rootless or rootful XWayland” was inverted.
    
    Fixes: a77d95af61c0 ("xwayland: Prevent Xserver grabs with rootless")
    Signed-off-by: Demi Marie Obenour <demiobenour at gmail.com>
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 72ea97ac2..427489690 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -685,7 +685,7 @@ static void
 xwl_screen_setup_custom_vector(struct xwl_screen *xwl_screen)
 {
     /* Rootfull Xwayland does not need a custom ProcVector (yet?) */
-    if (xwl_screen->rootless)
+    if (!xwl_screen->rootless)
         return;
 
     xwl_screen->GrabServer = ProcVector[X_GrabServer];