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

dix: Fix overzealous caching of ResourceClientBits() 

Commit c7311654 cached the value of ResourceClientBits(), but that value
depends on the `MaxClients` value set either from the command line or
from the configuration file.

For the latter, a call to ResourceClientBits() is issued before the
configuration file is read, meaning that the cached value is from the
default, not from the maximum number of clients set in the configuration
file.

That obviously causes all sort of issues, including memory corruption
and crashes of the Xserver when reaching the default limit value.

To avoid that issue, also keep the LimitClient value, and recompute the
ilog2() value if that changes, as on startup when the value is set from
the the xorg.conf ServerFlags section.

v2: Drop the `cache == 0` test
    Rename cache vars

Fixes: c7311654 - dix: cache ResourceClientBits() value
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 2efa6d6595)
This commit is contained in:
Olivier Fourdan 2022-07-12 14:44:48 +02:00 committed by Olivier Fourdan
parent a0216de236
commit c8ef9e3818
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dix/resource.c
View File

@ -620,12 +620,15 @@ ilog2(int val)
unsigned int unsigned int
ResourceClientBits(void) ResourceClientBits(void)
{ {
static unsigned int cached = 0; static unsigned int cache_ilog2 = 0;
static unsigned int cache_limit = 0;
if (cached == 0) if (LimitClients != cache_limit) {
cached = ilog2(LimitClients); cache_limit = LimitClients;
cache_ilog2 = ilog2(LimitClients);
}
return cached; return cache_ilog2;
} }
/***************** /*****************