fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 02:58:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xkb: fix incorrect size check when growing doodads in a section

Browse source 
In XkbAddGeomDoodad(), when adding a doodad to a specific section
(section != NULL), there is a comparison between section->num_doodads
and geom->sz_doodads instead of the section's own section->sz_doodads.

The else branch (global geometry doodads) was already correct.

Compare section->num_doodads against section->sz_doodads to prevent
a potential out-of-bounds.

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

Signed-off-by: Mikhail Dmitrichenko <m.dmitrichenko222@gmail.com>
(cherry picked from commit dd8b8cf49d)

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2225>
This commit is contained in:
Mikhail Dmitrichenko 2026-04-14 12:06:51 +03:00 • committed by Alan Coopersmith
parent a0241c1d38
commit e8ec7ca022
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xkb/XKBGAlloc.c
View file

@ -769,7 +769,7 @@ XkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name)
return doodad;
}
if (section) {
if ((section->num_doodads >= geom->sz_doodads) &&
if ((section->num_doodads >= section->sz_doodads) &&
(_XkbAllocDoodads(section, 1) != Success)) {
return NULL;
}