From 65888def4569416734d48a00321a306f3e30be509fdeb24a4e26310691143640 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 14 Nov 2018 13:47:20 +0000 Subject: [PATCH 1/4] Accepting request 648984 from home:michalsrb:bug1114822:X11:XOrg - U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch * Fix abort triggered by some uses of screensaver. (bsc#1114822) OBS-URL: https://build.opensuse.org/request/show/648984 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=722 --- ...onfigureWindow-instead-of-MoveWindow.patch | 51 +++++++++++++++++++ xorg-x11-server.changes | 6 +++ xorg-x11-server.spec | 4 ++ 3 files changed, 61 insertions(+) create mode 100644 U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch diff --git a/U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch b/U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch new file mode 100644 index 0000000..5d81325 --- /dev/null +++ b/U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch @@ -0,0 +1,51 @@ +Git-commit: fbdd4d679a7d020f78f7b877033b83e00f5a0f73 +Patch-Mainline: Upstream +Author: Michal Srb +Subject: dix/window: Use ConfigureWindow instead of MoveWindow +References: bsc#1114822 + +The screensaver can regularly move its window to random offsets. It should +use the ConfigureWindow function instead of calling the Screen's MoveWindow +directly. Some MoveWindow implementations, such as compMoveWindow, rely on +Screen's ConfigNotify being called first as it happens in ConfigureWindow. + +Reviewed-by: Adam Jackson +--- + dix/window.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/dix/window.c b/dix/window.c +index 2b599e788..f4ace76c7 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -3094,6 +3094,7 @@ int + dixSaveScreens(ClientPtr client, int on, int mode) + { + int rc, i, what, type; ++ XID vlist[2]; + + if (on == SCREEN_SAVER_FORCER) { + if (mode == ScreenSaverReset) +@@ -3146,14 +3147,11 @@ dixSaveScreens(ClientPtr client, int on, int mode) + * for the root window, so PaintWindow works + */ + screenIsSaved = SCREEN_SAVER_OFF; +- (*pWin->drawable.pScreen->MoveWindow) (pWin, +- (short) (- +- (rand() % +- RANDOM_WIDTH)), +- (short) (- +- (rand() % +- RANDOM_WIDTH)), +- pWin->nextSib, VTMove); ++ ++ vlist[0] = -(rand() % RANDOM_WIDTH); ++ vlist[1] = -(rand() % RANDOM_WIDTH); ++ ConfigureWindow(pWin, CWX | CWY, vlist, client); ++ + screenIsSaved = SCREEN_SAVER_ON; + } + /* +-- +2.16.4 + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 2ba52bc..7867318 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 14 13:45:37 UTC 2018 - msrb@suse.com + +- U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch + * Fix abort triggered by some uses of screensaver. (bsc#1114822) + ------------------------------------------------------------------- Mon Oct 29 15:35:59 UTC 2018 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 2560557..178c7bf 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -226,6 +226,8 @@ Patch1401: u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch Patch1501: U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch +Patch1502: U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch + %description This package contains the X.Org Server. @@ -367,6 +369,8 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch1501 -p1 +%patch1502 -p1 + %build test -e source-file-list || \ find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \ From d681bf3fa7067e28b3bac7fe6123b740ed2eb40fa0381f7b92968b1dda9e941d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 19 Nov 2018 15:25:52 +0000 Subject: [PATCH 2/4] added to changelog, that 1.20.0 superseded also U_glx-Do-not-call-into-Composite-if-it-is-disabled.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=723 --- xorg-x11-server.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 7867318..87a1596 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -125,6 +125,7 @@ Sat May 12 15:03:54 UTC 2018 - tobias.johannes.klausmann@mni.thm.de + U_0003-animcur-Run-the-timer-from-the-device-not-the-screen.patch + U_0004-animcur-Fix-transitions-between-animated-cursors.patch + U_xfree86-Remove-broken-RANDR-disabling-logic-v4.patch + + U_glx-Do-not-call-into-Composite-if-it-is-disabled.patch - Adapt patches to work with the new release: + N_zap_warning_xserver.diff + N_fix_fglrx_screendepth_issue.patch From e602657744f22e0b36d44359315e2ea9633d2fe33477998b31cd43cf49af6513 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 22 Nov 2018 10:49:04 +0000 Subject: [PATCH 3/4] - xorg-server 1.20.3 (see changelog below) superseded the following patch we used in sle15 before: - U_Disable-logfile-and-modulepath-when-running-with-ele.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=724 --- xorg-x11-server.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 87a1596..a8d61fe 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 22 10:47:07 UTC 2018 - sndirsch@suse.com + +- xorg-server 1.20.3 (see changelog below) superseded the + following patch we used in sle15 before: + - U_Disable-logfile-and-modulepath-when-running-with-ele.patch + ------------------------------------------------------------------- Wed Nov 14 13:45:37 UTC 2018 - msrb@suse.com From 109e32d9319fe7112b7b2d380ac44c2ea1c0adff4a5b995bb4bc30cd5de59b9e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 22 Nov 2018 13:25:17 +0000 Subject: [PATCH 4/4] added CVE number ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=725 --- xorg-x11-server.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index a8d61fe..9bd80fd 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -2,8 +2,8 @@ Thu Nov 22 10:47:07 UTC 2018 - sndirsch@suse.com - xorg-server 1.20.3 (see changelog below) superseded the - following patch we used in sle15 before: - - U_Disable-logfile-and-modulepath-when-running-with-ele.patch + following patch we used in sle15 before (bsc#1112020, CVE-2018-14665): + - U_Disable-logfile-and-modulepath-when-running-with-ele.patch ------------------------------------------------------------------- Wed Nov 14 13:45:37 UTC 2018 - msrb@suse.com