Skip to content

Commit 3f6181e

Browse files
azurelinux-securityjslobodzian
azurelinux-security
and
jslobodzian
authored
[AutoPR- Security] Patch xorg-x11-server-Xwayland for CVE-2025-62231, CVE-2025-62230, CVE-2025-62229 [HIGH] (microsoft#14994)
Co-authored-by: jslobodzian <[email protected]>
1 parent a580079 commit 3f6181e

File tree

4 files changed

+291
-1
lines changed

4 files changed

+291
-1
lines changed

‎SPECS/xorg-x11-server-Xwayland/CVE-2025-62229.patch‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
From 288a119572319575757c5d77bd8ccf0141b385cf Mon Sep 17 00:00:00 2001
2+
From: Olivier Fourdan <[email protected]>
3+
Date: Wed, 2 Jul 2025 09:46:22 +0200
4+
Subject: [PATCH] present: Fix use-after-free in present_create_notifies()
5+
6+
Using the Present extension, if an error occurs while processing and
7+
adding the notifications after presenting a pixmap, the function
8+
present_create_notifies() will clean up and remove the notifications
9+
it added.
10+
11+
However, there are two different code paths that can lead to an error
12+
creating the notify, one being before the notify is being added to the
13+
list, and another one after the notify is added.
14+
15+
When the error occurs before it's been added, it removes the elements up
16+
to the last added element, instead of the actual number of elements
17+
which were added.
18+
19+
As a result, in case of error, as with an invalid window for example, it
20+
leaves a dangling pointer to the last element, leading to a use after
21+
free case later:
22+
23+
| Invalid write of size 8
24+
| at 0x5361D5: present_clear_window_notifies (present_notify.c:42)
25+
| by 0x534A56: present_destroy_window (present_screen.c:107)
26+
| by 0x41E441: xwl_destroy_window (xwayland-window.c:1959)
27+
| by 0x4F9EC9: compDestroyWindow (compwindow.c:622)
28+
| by 0x51EAC4: damageDestroyWindow (damage.c:1592)
29+
| by 0x4FDC29: DbeDestroyWindow (dbe.c:1291)
30+
| by 0x4EAC55: FreeWindowResources (window.c:1023)
31+
| by 0x4EAF59: DeleteWindow (window.c:1091)
32+
| by 0x4DE59A: doFreeResource (resource.c:890)
33+
| by 0x4DEFB2: FreeClientResources (resource.c:1156)
34+
| by 0x4A9AFB: CloseDownClient (dispatch.c:3567)
35+
| by 0x5DCC78: ClientReady (connection.c:603)
36+
| Address 0x16126200 is 16 bytes inside a block of size 2,048 free'd
37+
| at 0x4841E43: free (vg_replace_malloc.c:989)
38+
| by 0x5363DD: present_destroy_notifies (present_notify.c:111)
39+
| by 0x53638D: present_create_notifies (present_notify.c:100)
40+
| by 0x5368E9: proc_present_pixmap_common (present_request.c:164)
41+
| by 0x536A7D: proc_present_pixmap (present_request.c:189)
42+
| by 0x536FA9: proc_present_dispatch (present_request.c:337)
43+
| by 0x4A1E4E: Dispatch (dispatch.c:561)
44+
| by 0x4B00F1: dix_main (main.c:284)
45+
| by 0x42879D: main (stubmain.c:34)
46+
| Block was alloc'd at
47+
| at 0x48463F3: calloc (vg_replace_malloc.c:1675)
48+
| by 0x5362A1: present_create_notifies (present_notify.c:81)
49+
| by 0x5368E9: proc_present_pixmap_common (present_request.c:164)
50+
| by 0x536A7D: proc_present_pixmap (present_request.c:189)
51+
| by 0x536FA9: proc_present_dispatch (present_request.c:337)
52+
| by 0x4A1E4E: Dispatch (dispatch.c:561)
53+
| by 0x4B00F1: dix_main (main.c:284)
54+
| by 0x42879D: main (stubmain.c:34)
55+
56+
To fix the issue, count and remove the actual number of notify elements
57+
added in case of error.
58+
59+
CVE-2025-62229, ZDI-CAN-27238
60+
61+
This vulnerability was discovered by:
62+
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
63+
64+
Signed-off-by: Olivier Fourdan <[email protected]>
65+
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2086>
66+
Signed-off-by: rpm-build <rpm-build>
67+
Upstream-reference: https://gitlab.freedesktop.org/xorg/xserver/-/commit/5a4286b1.patch
68+
---
69+
present/present_notify.c | 2 +-
70+
1 file changed, 1 insertion(+), 1 deletion(-)
71+
72+
diff --git a/present/present_notify.c b/present/present_notify.c
73+
index 4459549..00b3b68 100644
74+
--- a/present/present_notify.c
75+
+++ b/present/present_notify.c
76+
@@ -90,7 +90,7 @@ present_create_notifies(ClientPtr client, int num_notifies, xPresentNotify *x_no
77+
if (status != Success)
78+
goto bail;
79+
80+
- added = i;
81+
+ added++;
82+
}
83+
return Success;
84+
85+
--
86+
2.45.4
87+

‎SPECS/xorg-x11-server-Xwayland/CVE-2025-62230.patch‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
From bcdc1467253d444c8ace779fefae94b1c3f29b54 Mon Sep 17 00:00:00 2001
2+
From: Olivier Fourdan <[email protected]>
3+
Date: Wed, 10 Sep 2025 15:58:57 +0200
4+
Subject: [PATCH 1/2] xkb: Free the XKB resource when freeing XkbInterest
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
XkbRemoveResourceClient() would free the XkbInterest data associated
10+
with the device, but not the resource associated with it.
11+
12+
As a result, when the client terminates, the resource delete function
13+
gets called and accesses already freed memory:
14+
15+
| Invalid read of size 8
16+
| at 0x5BC0C0: XkbRemoveResourceClient (xkbEvents.c:1047)
17+
| by 0x5B3391: XkbClientGone (xkb.c:7094)
18+
| by 0x4DF138: doFreeResource (resource.c:890)
19+
| by 0x4DFB50: FreeClientResources (resource.c:1156)
20+
| by 0x4A9A59: CloseDownClient (dispatch.c:3550)
21+
| by 0x5E0A53: ClientReady (connection.c:601)
22+
| by 0x5E4FEF: ospoll_wait (ospoll.c:657)
23+
| by 0x5DC834: WaitForSomething (WaitFor.c:206)
24+
| by 0x4A1BA5: Dispatch (dispatch.c:491)
25+
| by 0x4B0070: dix_main (main.c:277)
26+
| by 0x4285E7: main (stubmain.c:34)
27+
| Address 0x1893e278 is 184 bytes inside a block of size 928 free'd
28+
| at 0x4842E43: free (vg_replace_malloc.c:989)
29+
| by 0x49C1A6: CloseDevice (devices.c:1067)
30+
| by 0x49C522: CloseOneDevice (devices.c:1193)
31+
| by 0x49C6E4: RemoveDevice (devices.c:1244)
32+
| by 0x5873D4: remove_master (xichangehierarchy.c:348)
33+
| by 0x587921: ProcXIChangeHierarchy (xichangehierarchy.c:504)
34+
| by 0x579BF1: ProcIDispatch (extinit.c:390)
35+
| by 0x4A1D85: Dispatch (dispatch.c:551)
36+
| by 0x4B0070: dix_main (main.c:277)
37+
| by 0x4285E7: main (stubmain.c:34)
38+
| Block was alloc'd at
39+
| at 0x48473F3: calloc (vg_replace_malloc.c:1675)
40+
| by 0x49A118: AddInputDevice (devices.c:262)
41+
| by 0x4A0E58: AllocDevicePair (devices.c:2846)
42+
| by 0x5866EE: add_master (xichangehierarchy.c:153)
43+
| by 0x5878C2: ProcXIChangeHierarchy (xichangehierarchy.c:493)
44+
| by 0x579BF1: ProcIDispatch (extinit.c:390)
45+
| by 0x4A1D85: Dispatch (dispatch.c:551)
46+
| by 0x4B0070: dix_main (main.c:277)
47+
| by 0x4285E7: main (stubmain.c:34)
48+
49+
To avoid that issue, make sure to free the resources when freeing the
50+
device XkbInterest data.
51+
52+
CVE-2025-62230, ZDI-CAN-27545
53+
54+
This vulnerability was discovered by:
55+
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
56+
57+
Signed-off-by: Olivier Fourdan <[email protected]>
58+
Reviewed-by: Michel Dänzer <[email protected]>
59+
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2086>
60+
---
61+
xkb/xkbEvents.c | 2 ++
62+
1 file changed, 2 insertions(+)
63+
64+
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
65+
index f8f65d4..7c669c9 100644
66+
--- a/xkb/xkbEvents.c
67+
+++ b/xkb/xkbEvents.c
68+
@@ -1055,6 +1055,7 @@ XkbRemoveResourceClient(DevicePtr inDev, XID id)
69+
autoCtrls = interest->autoCtrls;
70+
autoValues = interest->autoCtrlValues;
71+
client = interest->client;
72+
+ FreeResource(interest->resource, RT_XKBCLIENT);
73+
free(interest);
74+
found = TRUE;
75+
}
76+
@@ -1066,6 +1067,7 @@ XkbRemoveResourceClient(DevicePtr inDev, XID id)
77+
autoCtrls = victim->autoCtrls;
78+
autoValues = victim->autoCtrlValues;
79+
client = victim->client;
80+
+ FreeResource(victim->resource, RT_XKBCLIENT);
81+
free(victim);
82+
found = TRUE;
83+
}
84+
--
85+
2.45.4
86+
87+
88+
From f6a70756f4b556a1a84792096b61bf1021ac8438 Mon Sep 17 00:00:00 2001
89+
From: Olivier Fourdan <[email protected]>
90+
Date: Wed, 10 Sep 2025 15:55:06 +0200
91+
Subject: [PATCH 2/2] xkb: Make the RT_XKBCLIENT resource private
92+
MIME-Version: 1.0
93+
Content-Type: text/plain; charset=UTF-8
94+
Content-Transfer-Encoding: 8bit
95+
96+
Currently, the resource in only available to the xkb.c source file.
97+
98+
In preparation for the next commit, to be able to free the resources
99+
from XkbRemoveResourceClient(), make that variable private instead.
100+
101+
This is related to:
102+
103+
CVE-2025-62230, ZDI-CAN-27545
104+
105+
This vulnerability was discovered by:
106+
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
107+
108+
Signed-off-by: Olivier Fourdan <[email protected]>
109+
Reviewed-by: Michel Dänzer <[email protected]>
110+
(cherry picked from commit 99790a2c9205a52fbbec01f21a92c9b7f4ed1d8f)
111+
112+
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2087>
113+
Signed-off-by: rpm-build <rpm-build>
114+
Upstream-reference: https://gitlab.freedesktop.org/ofourdan/xserver/-/commit/10c94238bdad17c11707e0bdaaa3a9cd54c504be.patch https://gitlab.freedesktop.org/ofourdan/xserver/-/commit/865089ca70840c0f13a61df135f7b44a9782a175.patch
115+
---
116+
include/xkbsrv.h | 2 ++
117+
xkb/xkb.c | 2 +-
118+
2 files changed, 3 insertions(+), 1 deletion(-)
119+
120+
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
121+
index bd74785..d801cd4 100644
122+
--- a/include/xkbsrv.h
123+
+++ b/include/xkbsrv.h
124+
@@ -58,6 +58,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
125+
#include "inputstr.h"
126+
#include "events.h"
127+
128+
+extern RESTYPE RT_XKBCLIENT;
129+
+
130+
typedef struct _XkbInterest {
131+
DeviceIntPtr dev;
132+
ClientPtr client;
133+
diff --git a/xkb/xkb.c b/xkb/xkb.c
134+
index ac154e2..6c102af 100644
135+
--- a/xkb/xkb.c
136+
+++ b/xkb/xkb.c
137+
@@ -50,7 +50,7 @@ int XkbKeyboardErrorCode;
138+
CARD32 xkbDebugFlags = 0;
139+
static CARD32 xkbDebugCtrls = 0;
140+
141+
-static RESTYPE RT_XKBCLIENT;
142+
+RESTYPE RT_XKBCLIENT = 0;
143+
144+
/***====================================================================***/
145+
146+
--
147+
2.45.4
148+

‎SPECS/xorg-x11-server-Xwayland/CVE-2025-62231.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From 4312de85985485587f2a75685928e30c242ae5d0 Mon Sep 17 00:00:00 2001
2+
From: Olivier Fourdan <[email protected]>
3+
Date: Wed, 10 Sep 2025 16:30:29 +0200
4+
Subject: [PATCH] xkb: Prevent overflow in XkbSetCompatMap()
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
The XkbCompatMap structure stores its "num_si" and "size_si" fields
10+
using an unsigned short.
11+
12+
However, the function _XkbSetCompatMap() will store the sum of the
13+
input data "firstSI" and "nSI" in both XkbCompatMap's "num_si" and
14+
"size_si" without first checking if the sum overflows the maximum
15+
unsigned short value, leading to a possible overflow.
16+
17+
To avoid the issue, check whether the sum does not exceed the maximum
18+
unsigned short value, or return a "BadValue" error otherwise.
19+
20+
CVE-2025-62231, ZDI-CAN-27560
21+
22+
This vulnerability was discovered by:
23+
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
24+
25+
Signed-off-by: Olivier Fourdan <[email protected]>
26+
Reviewed-by: Michel Dänzer <[email protected]>
27+
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2086>
28+
Signed-off-by: rpm-build <rpm-build>
29+
Upstream-reference: https://gitlab.freedesktop.org/xorg/xserver/-/commit/475d9f49.patch
30+
---
31+
xkb/xkb.c | 2 ++
32+
1 file changed, 2 insertions(+)
33+
34+
diff --git a/xkb/xkb.c b/xkb/xkb.c
35+
index 6c102af..a77fe7f 100644
36+
--- a/xkb/xkb.c
37+
+++ b/xkb/xkb.c
38+
@@ -2990,6 +2990,8 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev,
39+
XkbSymInterpretPtr sym;
40+
unsigned int skipped = 0;
41+
42+
+ if ((unsigned) (req->firstSI + req->nSI) > USHRT_MAX)
43+
+ return BadValue;
44+
if ((unsigned) (req->firstSI + req->nSI) > compat->size_si) {
45+
compat->num_si = compat->size_si = req->firstSI + req->nSI;
46+
compat->sym_interpret = reallocarray(compat->sym_interpret,
47+
--
48+
2.45.4
49+

‎SPECS/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Distribution: Azure Linux
1111
Summary: Xwayland
1212
Name: xorg-x11-server-Xwayland
1313
Version: 24.1.6
14-
Release: 2%{?dist}
14+
Release: 3%{?dist}
1515

1616
License: MIT
1717
URL: http://www.x.org
@@ -93,6 +93,9 @@ Patch1: CVE-2025-49177.patch
9393
Patch2: CVE-2025-49178.patch
9494
Patch3: CVE-2025-49179.patch
9595
Patch4: CVE-2025-49180.patch
96+
Patch5: CVE-2025-62229.patch
97+
Patch6: CVE-2025-62230.patch
98+
Patch7: CVE-2025-62231.patch
9699

97100
%description
98101
Xwayland is an X server for running X clients under Wayland.
@@ -143,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
143146
%{_libdir}/pkgconfig/xwayland.pc
144147

145148
%changelog
149+
* Sun Nov 02 2025 Azure Linux Security Servicing Account <[email protected]> - 24.1.6-3
150+
- Patch for CVE-2025-62231, CVE-2025-62230, CVE-2025-62229
151+
146152
* Mon Jun 23 2025 Kevin Lockwood <[email protected]> - 24.1.6-2
147153
- Add patch for CVE-2025-49175
148154
- Add patch for CVE-2025-49177

0 commit comments

Comments
 (0)