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

os: Fix NULL pointer dereference

Browse source 
RemoveHost() can be called from DisableLocalHost() with a NULL client,
but doesn't actually check whether the given client pointer is valid on
error and assigns the error value unconditionally, leading to a possible
NULL pointer dereference and a crash of the Xserver.

To avoid the issue, simply check whether the client pointer is not NULL
prior to assign the errorValue.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1752
See-also: https://bugzilla.redhat.com/2313799
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1701>
(cherry picked from commit 57a446c0f9)
This commit is contained in:
Olivier Fourdan 2024-09-23 09:27:21 +02:00 • committed by Alan Coopersmith
parent 8721189d46
commit affb27caa2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
os/access.c
View file

@ -1365,13 +1365,15 @@ RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in p
case FamilyChaos:
case FamilyServerInterpreted:
if ((len = CheckAddr(family, pAddr, length)) < 0) {
client->errorValue = length;
if (client)
client->errorValue = length;
return BadValue;
}
break;
case FamilyLocal:
default:
client->errorValue = family;
if (client)
client->errorValue = family;
return BadValue;
}
for (prev = &validhosts;