SLFO-pool/xorg-x11-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main xorg-x11-server revision dd06437cd4a91e3f334a9fde7b52e297

Browse Source
This commit is contained in:
Adrian Schröter 2024-11-12 12:21:10 +01:00
parent c565876d07
commit 7dad0f4ee8
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
U_xkb-Fix-buffer-overflow-in-_XkbSetCompatMap.patch Normal file
View File

@ -0,0 +1,25 @@
@@ -, +, @@
---
xkb/xkb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/xkb/xkb.c
+++ a/xkb/xkb.c
@@ -2991,13 +2991,13 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev,
XkbSymInterpretPtr sym;
unsigned int skipped = 0;
- if ((unsigned) (req->firstSI + req->nSI) > compat->num_si) {
- compat->num_si = req->firstSI + req->nSI;
+ if ((unsigned) (req->firstSI + req->nSI) > compat->size_si) {
+ compat->num_si = compat->size_si = req->firstSI + req->nSI;
compat->sym_interpret = reallocarray(compat->sym_interpret,
- compat->num_si,
+ compat->size_si,
sizeof(XkbSymInterpretRec));
if (!compat->sym_interpret) {
- compat->num_si = 0;
+ compat->num_si = compat->size_si = 0;
return BadAlloc;
}
}
--

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Oct 19 22:17:53 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- U_xkb-Fix-buffer-overflow-in-_XkbSetCompatMap.patch
* Heap-based buffer overflow privilege escalation in _XkbSetCompatMap
(CVE-2024-9632, bsc#1231565)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 10 14:09:31 UTC 2024 - Stefan Dirsch <sndirsch@suse.com> Wed Apr 10 14:09:31 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

3
xorg-x11-server.spec
View File

@ -57,7 +57,7 @@ Source90: xorg-x11-server.macros.in
# Source91 and Source99 are used to ensure proper ABI provides. # Source91 and Source99 are used to ensure proper ABI provides.
Source91: xorg-server-provides Source91: xorg-server-provides
Source92: pre_checkin.sh Source92: pre_checkin.sh
Patch1231565: U_xkb-Fix-buffer-overflow-in-_XkbSetCompatMap.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
@ -409,6 +409,7 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1222311 -p1 %patch1222311 -p1
%patch1222312 -p1 %patch1222312 -p1
%patch1222442 -p1 %patch1222442 -p1
%patch1231565 -p1
%build %build
# We have some -z now related errors during X default startup (boo#1197994): # We have some -z now related errors during X default startup (boo#1197994):