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

os: avoid closing null fd at Fopen

Browse source 
In `Fopen` function variable `iop` may store NULL as a result of `fopen`
call. In this case, if later privileges couldn't be restored (`seteuid`
call fails), further `fclose(iop)` call will cause runtime error.

This commit adds check `iop` for NULL before calling `fclose` to prevent
potential NULL pointer dereference.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Mikhail Dmitrichenko <m.dmitrichenko222@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2115>
(cherry picked from commit f83807647e)
(cherry picked from commit dd2255c309)
This commit is contained in:
Mikhail Dmitrichenko 2025-12-17 11:52:16 +03:00 • committed by Olivier Fourdan
parent cc583d746d
commit 5129ddd030
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
os/utils.c
View file

@ -1406,7 +1406,9 @@ Fopen(const char *file, const char *type)
iop = fopen(file, type);
if (seteuid(euid) == -1) {
fclose(iop);
if (iop) {
fclose(iop);
}
return NULL;
}
return iop;