Skip to content
Snippets Groups Projects
Commit 6e0f332b authored by Olivier Fourdan's avatar Olivier Fourdan :tools:
Browse files

dix: Dequeue pending events on frozen device on removal


When a device is removed while still frozen, the events queued for that
device remain while the device itself is freed.

As a result, replaying the events will cause a use after free.

To avoid the issue, make sure to dequeue and free any pending events on
a frozen device when removed.

CVE-2025-26600, ZDI-CAN-25871

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

Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
Reviewed-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Part-of: <!1828>
parent b07192a8
No related branches found
No related tags found
1 merge request!1828Multiple CVE fixes
......@@ -981,6 +981,23 @@ FreeAllDeviceClasses(ClassesPtr classes)
}
static void
FreePendingFrozenDeviceEvents(DeviceIntPtr dev)
{
QdEventPtr qe, tmp;
if (!dev->deviceGrab.sync.frozen)
return;
/* Dequeue any frozen pending events */
xorg_list_for_each_entry_safe(qe, tmp, &syncEvents.pending, next) {
if (qe->device == dev) {
xorg_list_del(&qe->next);
free(qe);
}
}
}
/**
* Close down a device and free all resources.
* Once closed down, the driver will probably not expect you that you'll ever
......@@ -1044,6 +1061,7 @@ CloseDevice(DeviceIntPtr dev)
valuator_mask_free(&dev->last.touches[j].valuators);
free(dev->last.touches);
dev->config_info = NULL;
FreePendingFrozenDeviceEvents(dev);
dixFreePrivates(dev->devPrivates, PRIVATE_DEVICE);
free(dev);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment