37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
From 8660dd164882ce5fc1f274427e2ff3dc020d6273 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Date: Wed, 25 Jan 2023 11:41:40 +1000
|
||
|
|
Subject: [PATCH xserver] Xi: fix potential use-after-free in
|
||
|
|
DeepCopyPointerClasses
|
||
|
|
|
||
|
|
CVE-2023-0494, ZDI-CAN-19596
|
||
|
|
|
||
|
|
This vulnerability was discovered by:
|
||
|
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
||
|
|
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
(cherry picked from commit 0ba6d8c37071131a49790243cdac55392ecf71ec)
|
||
|
|
---
|
||
|
|
Xi/exevents.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Xi/exevents.c b/Xi/exevents.c
|
||
|
|
index 217baa956..dcd4efb3b 100644
|
||
|
|
--- a/Xi/exevents.c
|
||
|
|
+++ b/Xi/exevents.c
|
||
|
|
@@ -619,8 +619,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
|
||
|
|
memcpy(to->button->xkb_acts, from->button->xkb_acts,
|
||
|
|
sizeof(XkbAction));
|
||
|
|
}
|
||
|
|
- else
|
||
|
|
+ else {
|
||
|
|
free(to->button->xkb_acts);
|
||
|
|
+ to->button->xkb_acts = NULL;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
memcpy(to->button->labels, from->button->labels,
|
||
|
|
from->button->numButtons * sizeof(Atom));
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|