fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-15 04:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xkb: Fix buffer overflow in XkbVModMaskText()

Browse source 
The code in XkbVModMaskText() allocates a fixed sized buffer on the
stack and copies the virtual mod name.

There's actually two issues in the code that can lead to a buffer
overflow.

First, the bound check mixes pointers and integers using misplaced
parenthesis, defeating the bound check.

But even though, if the check fails, the data is still copied, so the
stack overflow will occur regardless.

Change the logic to skip the copy entirely if the bound check fails.

CVE-2025-26595, ZDI-CAN-25545

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: Peter Hutterer <peter.hutterer@who-t.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1828>
(cherry picked from commit 11fcda8753)
This commit is contained in:
Olivier Fourdan 2024-11-27 14:41:45 +01:00 • committed by Alan Coopersmith
parent 077944f99e
commit 4252aaedb7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xkb/xkbtext.c
View file

@ -174,14 +174,14 @@ XkbVModMaskText(XkbDescPtr xkb,
len = strlen(tmp) + 1 + (str == buf ? 0 : 1);
if (format == XkbCFile)
len += 4;
if ((str - (buf + len)) <= VMOD_BUFFER_SIZE) {
if (str != buf) {
if (format == XkbCFile)
*str++ = '|';
else
*str++ = '+';
len--;
}
if ((str - buf) + len > VMOD_BUFFER_SIZE)
continue; /* Skip */
if (str != buf) {
if (format == XkbCFile)
*str++ = '|';
else
*str++ = '+';
len--;
}
if (format == XkbCFile)
sprintf(str, "%sMask", tmp);