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 <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(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 <ofourdan@redhat.com>
-
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:
Changes:
configure.ac
| ... |
... |
@@ -26,8 +26,8 @@ dnl |
|
26
|
26
|
dnl Process this file with autoconf to create configure.
|
|
27
|
27
|
|
|
28
|
28
|
AC_PREREQ(2.60)
|
|
29
|
|
-AC_INIT([xorg-server], 21.1.7, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
30
|
|
-RELEASE_DATE="2023-02-07"
|
|
|
29
|
+AC_INIT([xorg-server], 21.1.8, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
|
30
|
+RELEASE_DATE="2023-03-29"
|
|
31
|
31
|
RELEASE_NAME="Caramel Ice Cream"
|
|
32
|
32
|
AC_CONFIG_SRCDIR([Makefile.am])
|
|
33
|
33
|
AC_CONFIG_MACRO_DIR([m4])
|
debian/changelog
|
|
1
|
+xorg-server (2:21.1.8-1) unstable; urgency=medium
|
|
|
2
|
+
|
|
|
3
|
+ * patches: Drop an obsolete patch. (Closes: #1034413)
|
|
|
4
|
+ * New upstream release.
|
|
|
5
|
+
|
|
|
6
|
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 01 Aug 2023 12:26:02 +0300
|
|
|
7
|
+
|
|
1
|
8
|
xorg-server (2:21.1.7-3) unstable; urgency=medium
|
|
2
|
9
|
|
|
3
|
10
|
* Enable DRI2 for the udeb build, needed in addition to DRM support
|
debian/patches/present-Check-for-NULL-to-prevent-crash.patch
deleted
|
1
|
|
-From 69774044716039fa70655b3bc6dd6a4ff4535cfd Mon Sep 17 00:00:00 2001
|
|
2
|
|
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
|
|
3
|
|
-Date: Thu, 13 Jan 2022 00:47:27 +0100
|
|
4
|
|
-Subject: [PATCH] present: Check for NULL to prevent crash
|
|
5
|
|
-MIME-Version: 1.0
|
|
6
|
|
-Content-Type: text/plain; charset=UTF-8
|
|
7
|
|
-Content-Transfer-Encoding: 8bit
|
|
8
|
|
-
|
|
9
|
|
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
|
|
10
|
|
-Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
|
|
11
|
|
-Tested-by: Aaron Plattner <aplattner@nvidia.com>
|
|
12
|
|
-(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
|
|
13
|
|
----
|
|
14
|
|
- present/present_scmd.c | 6 ++++++
|
|
15
|
|
- 1 file changed, 6 insertions(+)
|
|
16
|
|
-
|
|
17
|
|
-diff --git a/present/present_scmd.c b/present/present_scmd.c
|
|
18
|
|
-index da836ea6b..239055bc1 100644
|
|
19
|
|
---- a/present/present_scmd.c
|
|
20
|
|
-+++ b/present/present_scmd.c
|
|
21
|
|
-@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
|
|
22
|
|
- if (!screen_priv->info)
|
|
23
|
|
- return NULL;
|
|
24
|
|
-
|
|
25
|
|
-+ if (!screen_priv->info->get_crtc)
|
|
26
|
|
-+ return NULL;
|
|
27
|
|
-+
|
|
28
|
|
- return (*screen_priv->info->get_crtc)(window);
|
|
29
|
|
- }
|
|
30
|
|
-
|
|
31
|
|
-@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
|
|
32
|
|
- if (!screen_priv->info)
|
|
33
|
|
- return;
|
|
34
|
|
-
|
|
35
|
|
-+ if (!screen_priv->info->flush)
|
|
36
|
|
-+ return;
|
|
37
|
|
-+
|
|
38
|
|
- (*screen_priv->info->flush) (window);
|
|
39
|
|
- }
|
|
40
|
|
-
|
|
41
|
|
---
|
|
42
|
|
-2.34.1
|
|
43
|
|
- |
debian/patches/series
| ... |
... |
@@ -5,4 +5,3 @@ |
|
5
|
5
|
05_Revert-Unload-submodules.diff
|
|
6
|
6
|
06_use-intel-only-on-pre-gen4.diff
|
|
7
|
7
|
07_use-modesetting-driver-by-default-on-GeForce.diff |
|
8
|
|
-present-Check-for-NULL-to-prevent-crash.patch |
meson.build
| ... |
... |
@@ -3,10 +3,10 @@ project('xserver', 'c', |
|
3
|
3
|
'buildtype=debugoptimized',
|
|
4
|
4
|
'c_std=gnu99',
|
|
5
|
5
|
],
|
|
6
|
|
- version: '21.1.7',
|
|
|
6
|
+ version: '21.1.8',
|
|
7
|
7
|
meson_version: '>= 0.47.0',
|
|
8
|
8
|
)
|
|
9
|
|
-release_date = '2023-02-07'
|
|
|
9
|
+release_date = '2023-03-29'
|
|
10
|
10
|
|
|
11
|
11
|
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
|
|
12
|
12
|
cc = meson.get_compiler('c')
|
xkb/xkbUtils.c
| ... |
... |
@@ -902,9 +902,9 @@ XkbConvertCase(register KeySym sym, KeySym * lower, KeySym * upper) |
|
902
|
902
|
break;
|
|
903
|
903
|
case 6: /* Cyrillic */
|
|
904
|
904
|
/* Assume the KeySym is a legal value (ignore discontinuities) */
|
|
905
|
|
- if (sym >= XK_Serbian_DJE && sym <= XK_Serbian_DZE)
|
|
|
905
|
+ if (sym >= XK_Serbian_DJE && sym <= XK_Cyrillic_DZHE)
|
|
906
|
906
|
*lower -= (XK_Serbian_DJE - XK_Serbian_dje);
|
|
907
|
|
- else if (sym >= XK_Serbian_dje && sym <= XK_Serbian_dze)
|
|
|
907
|
+ else if (sym >= XK_Serbian_dje && sym <= XK_Cyrillic_dzhe)
|
|
908
|
908
|
*upper += (XK_Serbian_DJE - XK_Serbian_dje);
|
|
909
|
909
|
else if (sym >= XK_Cyrillic_YU && sym <= XK_Cyrillic_HARDSIGN)
|
|
910
|
910
|
*lower -= (XK_Cyrillic_YU - XK_Cyrillic_yu);
|
|