Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
Commits: 6bed5cfd by Benno Schulenberg at 2023-03-29T10:14:00+02:00 xkbUtils: use existing symbol names instead of deleted deprecated ones Symbols `XK_Cyrillic_DZHE` and `XK_Serbian_DZE` were pure synonyms. (cherry picked from commit 6153c71cfb4698f1a416266564ecc748e4a25f2c) - - - - - fb51d5dd by Olivier Fourdan at 2023-03-29T14:20:26+02:00 composite: Fix use-after-free of the COW ZDI-CAN-19866/CVE-2023-1393 If a client explicitly destroys the compositor overlay window (aka COW), we would leave a dangling pointer to that window in the CompScreen structure, which will trigger a use-after-free later. Make sure to clear the CompScreen pointer to the COW when the latter gets destroyed explicitly by the client. This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative Signed-off-by: Olivier Fourdan <[email protected]> Reviewed-by: Adam Jackson <[email protected]> (cherry picked from commit 26ef545b3502f61ca722a7a3373507e88ef64110) - - - - - 7c791b15 by Olivier Fourdan at 2023-03-29T14:20:26+02:00 xserver 21.1.8 Signed-off-by: Olivier Fourdan <[email protected]> - - - - - 36de5de0 by Timo Aaltonen at 2023-06-19T14:50:31+03:00 patches: Drop an obsolete patch. (Closes: #1034413) - - - - - 5f9b3cc6 by Timo Aaltonen at 2023-08-01T12:21:40+03:00 Merge branch 'upstream-unstable' into debian-unstable - - - - - 95728b8d by Timo Aaltonen at 2023-08-01T12:22:54+03:00 version bump - - - - - e1ceb4bb by Timo Aaltonen at 2023-08-01T12:26:15+03:00 release to sid - - - - - 6 changed files: - configure.ac - debian/changelog - − debian/patches/present-Check-for-NULL-to-prevent-crash.patch - debian/patches/series - meson.build - xkb/xkbUtils.c Changes: ===================================== configure.ac ===================================== @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 21.1.7, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2023-02-07" +AC_INIT([xorg-server], 21.1.8, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2023-03-29" RELEASE_NAME="Caramel Ice Cream" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +xorg-server (2:21.1.8-1) unstable; urgency=medium + + * patches: Drop an obsolete patch. (Closes: #1034413) + * New upstream release. + + -- Timo Aaltonen <[email protected]> Tue, 01 Aug 2023 12:26:02 +0300 + xorg-server (2:21.1.7-3) unstable; urgency=medium * Enable DRI2 for the udeb build, needed in addition to DRM support ===================================== debian/patches/present-Check-for-NULL-to-prevent-crash.patch deleted ===================================== @@ -1,43 +0,0 @@ -From 69774044716039fa70655b3bc6dd6a4ff4535cfd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <[email protected]> -Date: Thu, 13 Jan 2022 00:47:27 +0100 -Subject: [PATCH] present: Check for NULL to prevent crash -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275 -Signed-off-by: Błażej Szczygieł <[email protected]> -Tested-by: Aaron Plattner <[email protected]> -(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c) ---- - present/present_scmd.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/present/present_scmd.c b/present/present_scmd.c -index da836ea6b..239055bc1 100644 ---- a/present/present_scmd.c -+++ b/present/present_scmd.c -@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window) - if (!screen_priv->info) - return NULL; - -+ if (!screen_priv->info->get_crtc) -+ return NULL; -+ - return (*screen_priv->info->get_crtc)(window); - } - -@@ -196,6 +199,9 @@ present_flush(WindowPtr window) - if (!screen_priv->info) - return; - -+ if (!screen_priv->info->flush) -+ return; -+ - (*screen_priv->info->flush) (window); - } - --- -2.34.1 - ===================================== debian/patches/series ===================================== @@ -5,4 +5,3 @@ 05_Revert-Unload-submodules.diff 06_use-intel-only-on-pre-gen4.diff 07_use-modesetting-driver-by-default-on-GeForce.diff -present-Check-for-NULL-to-prevent-crash.patch ===================================== meson.build ===================================== @@ -3,10 +3,10 @@ project('xserver', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '21.1.7', + version: '21.1.8', meson_version: '>= 0.47.0', ) -release_date = '2023-02-07' +release_date = '2023-03-29' add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) cc = meson.get_compiler('c') ===================================== xkb/xkbUtils.c ===================================== @@ -902,9 +902,9 @@ XkbConvertCase(register KeySym sym, KeySym * lower, KeySym * upper) break; case 6: /* Cyrillic */ /* Assume the KeySym is a legal value (ignore discontinuities) */ - if (sym >= XK_Serbian_DJE && sym <= XK_Serbian_DZE) + if (sym >= XK_Serbian_DJE && sym <= XK_Cyrillic_DZHE) *lower -= (XK_Serbian_DJE - XK_Serbian_dje); - else if (sym >= XK_Serbian_dje && sym <= XK_Serbian_dze) + else if (sym >= XK_Serbian_dje && sym <= XK_Cyrillic_dzhe) *upper += (XK_Serbian_DJE - XK_Serbian_dje); else if (sym >= XK_Cyrillic_YU && sym <= XK_Cyrillic_HARDSIGN) *lower -= (XK_Cyrillic_YU - XK_Cyrillic_yu); View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/d376ac365f3bf9f31068f7a177744f87e84d44ad...e1ceb4bb1c123db3b1b862cceb6e7f7c8314b84a -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/d376ac365f3bf9f31068f7a177744f87e84d44ad...e1ceb4bb1c123db3b1b862cceb6e7f7c8314b84a You're receiving this email because of your account on salsa.debian.org.
