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

Xi: Fix barrier device search 

The function GetBarrierDevice() would search for the pointer device
based on its device id and return the matching value, or supposedly NULL
if no match was found.

Unfortunately, as written, it would return the last element of the list
if no matching device id was found which can lead to out of bounds
memory access.

Fix the search function to return NULL if not matching device is found,
and adjust the callers to handle the case where the device cannot be
found.

CVE-2025-26598, ZDI-CAN-25740

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>
This commit is contained in:
Olivier Fourdan 2024-12-16 11:25:11 +01:00
parent 0e4ed94952
commit bba9df1a9d
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Xi/xibarriers.c
View File

@ -132,14 +132,15 @@ static void FreePointerBarrierClient(struct PointerBarrierClient *c)
static struct PointerBarrierDevice *GetBarrierDevice(struct PointerBarrierClient *c, int deviceid) static struct PointerBarrierDevice *GetBarrierDevice(struct PointerBarrierClient *c, int deviceid)
{ {
struct PointerBarrierDevice *pbd = NULL; struct PointerBarrierDevice *p, *pbd = NULL;
xorg_list_for_each_entry(pbd, &c->per_device, entry) { xorg_list_for_each_entry(p, &c->per_device, entry) {
if (pbd->deviceid == deviceid) if (p->deviceid == deviceid) {
pbd = p;
break; break;
} }
}
BUG_WARN(!pbd);
return pbd; return pbd;
} }
@ -340,6 +341,9 @@ barrier_find_nearest(BarrierScreenPtr cs, DeviceIntPtr dev,
double distance; double distance;
pbd = GetBarrierDevice(c, dev->id); pbd = GetBarrierDevice(c, dev->id);
if (!pbd)
continue;
if (pbd->seen) if (pbd->seen)
continue; continue;
@ -448,6 +452,9 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
nearest = &c->barrier; nearest = &c->barrier;
pbd = GetBarrierDevice(c, master->id); pbd = GetBarrierDevice(c, master->id);
if (!pbd)
continue;
new_sequence = !pbd->hit; new_sequence = !pbd->hit;
pbd->seen = TRUE; pbd->seen = TRUE;
@ -488,6 +495,9 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
int flags = 0; int flags = 0;
pbd = GetBarrierDevice(c, master->id); pbd = GetBarrierDevice(c, master->id);
if (!pbd)
continue;
pbd->seen = FALSE; pbd->seen = FALSE;
if (!pbd->hit) if (!pbd->hit)
continue; continue;
@ -682,6 +692,9 @@ BarrierFreeBarrier(void *data, XID id)
continue; continue;
pbd = GetBarrierDevice(c, dev->id); pbd = GetBarrierDevice(c, dev->id);
if (!pbd)
continue;
if (!pbd->hit) if (!pbd->hit)
continue; continue;
@ -741,6 +754,8 @@ static void remove_master_func(void *res, XID id, void *devid)
barrier = container_of(b, struct PointerBarrierClient, barrier); barrier = container_of(b, struct PointerBarrierClient, barrier);
pbd = GetBarrierDevice(barrier, *deviceid); pbd = GetBarrierDevice(barrier, *deviceid);
if (!pbd)
return;
if (pbd->hit) { if (pbd->hit) {
BarrierEvent ev = { BarrierEvent ev = {
@ -905,6 +920,10 @@ ProcXIBarrierReleasePointer(ClientPtr client)
barrier = container_of(b, struct PointerBarrierClient, barrier); barrier = container_of(b, struct PointerBarrierClient, barrier);
pbd = GetBarrierDevice(barrier, dev->id); pbd = GetBarrierDevice(barrier, dev->id);
if (!pbd) {
client->errorValue = dev->id;
return BadDevice;
}
if (pbd->barrier_event_id == event_id) if (pbd->barrier_event_id == event_id)
pbd->release_event_id = event_id; pbd->release_event_id = event_id;