frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: do not keep linked list pointer during recursion 

The `DisableDevice()` function is called whenever an enabled device
is disabled and it moves the device from the `inputInfo.devices` linked
list to the `inputInfo.off_devices` linked list.

However, its link/unlink operation has an issue during the recursive
call to `DisableDevice()` due to the `prev` pointer pointing to a
removed device.

This issue leads to a length mismatch between the total number of
devices and the number of device in the list, leading to a heap
overflow and, possibly, to local privilege escalation.

Simplify the code that checked whether the device passed to
`DisableDevice()` was in `inputInfo.devices` or not and find the
previous device after the recursion.

CVE-2024-21886, ZDI-CAN-22840

This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative

(cherry picked from commit bc1fdbe465)
This commit is contained in:
José Expósito 2023-12-22 18:28:31 +01:00 committed by José Expósito
parent 6236342157
commit 7b5694368b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dix/devices.c
View File

@ -447,14 +447,20 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
{ {
DeviceIntPtr *prev, other; DeviceIntPtr *prev, other;
BOOL enabled; BOOL enabled;
BOOL dev_in_devices_list = FALSE;
int flags[MAXDEVICES] = { 0 }; int flags[MAXDEVICES] = { 0 };
if (!dev->enabled) if (!dev->enabled)
return TRUE; return TRUE;
for (prev = &inputInfo.devices; for (other = inputInfo.devices; other; other = other->next) {
*prev && (*prev != dev); prev = &(*prev)->next); if (other == dev) {
if (*prev != dev) dev_in_devices_list = TRUE;
break;
}
}
if (!dev_in_devices_list)
return FALSE; return FALSE;
TouchEndPhysicallyActiveTouches(dev); TouchEndPhysicallyActiveTouches(dev);
@ -505,6 +511,9 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
LeaveWindow(dev); LeaveWindow(dev);
SetFocusOut(dev); SetFocusOut(dev);
for (prev = &inputInfo.devices;
*prev && (*prev != dev); prev = &(*prev)->next);
*prev = dev->next; *prev = dev->next;
dev->next = inputInfo.off_devices; dev->next = inputInfo.off_devices;
inputInfo.off_devices = dev; inputInfo.off_devices = dev;