|
 |
031995 |
From a31ba141824a7649e11f0ef7673718ce559d6337 Mon Sep 17 00:00:00 2001
|
|
|
031995 |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
031995 |
Date: Tue, 3 Oct 2023 11:53:05 +1000
|
|
|
031995 |
Subject: [PATCH xserver 1/4] Xi/randr: fix handling of PropModeAppend/Prepend
|
|
|
031995 |
|
|
|
031995 |
The handling of appending/prepending properties was incorrect, with at
|
|
|
031995 |
least two bugs: the property length was set to the length of the new
|
|
|
031995 |
part only, i.e. appending or prepending N elements to a property with P
|
|
|
031995 |
existing elements always resulted in the property having N elements
|
|
|
031995 |
instead of N + P.
|
|
|
031995 |
|
|
|
031995 |
Second, when pre-pending a value to a property, the offset for the old
|
|
|
031995 |
values was incorrect, leaving the new property with potentially
|
|
|
031995 |
uninitalized values and/or resulting in OOB memory writes.
|
|
|
031995 |
For example, prepending a 3 element value to a 5 element property would
|
|
|
031995 |
result in this 8 value array:
|
|
|
031995 |
[N, N, N, ?, ?, P, P, P ] P, P
|
|
|
031995 |
^OOB write
|
|
|
031995 |
|
|
|
031995 |
The XI2 code is a copy/paste of the RandR code, so the bug exists in
|
|
|
031995 |
both.
|
|
|
031995 |
|
|
|
031995 |
CVE-2023-5367, ZDI-CAN-22153
|
|
|
031995 |
|
|
|
031995 |
This vulnerability was discovered by:
|
|
|
031995 |
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
|
|
031995 |
|
|
|
031995 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
031995 |
---
|
|
|
031995 |
Xi/xiproperty.c | 4 ++--
|
|
|
031995 |
randr/rrproperty.c | 4 ++--
|
|
|
031995 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
031995 |
|
|
|
031995 |
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
|
|
|
031995 |
index 6ec419e870..563c4f31a5 100644
|
|
|
031995 |
--- a/Xi/xiproperty.c
|
|
|
031995 |
+++ b/Xi/xiproperty.c
|
|
|
031995 |
@@ -730,7 +730,7 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
|
|
|
031995 |
XIDestroyDeviceProperty(prop);
|
|
|
031995 |
return BadAlloc;
|
|
|
031995 |
}
|
|
|
031995 |
- new_value.size = len;
|
|
|
031995 |
+ new_value.size = total_len;
|
|
|
031995 |
new_value.type = type;
|
|
|
031995 |
new_value.format = format;
|
|
|
031995 |
|
|
|
031995 |
@@ -747,7 +747,7 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
|
|
|
031995 |
case PropModePrepend:
|
|
|
031995 |
new_data = new_value.data;
|
|
|
031995 |
old_data = (void *) (((char *) new_value.data) +
|
|
|
031995 |
- (prop_value->size * size_in_bytes));
|
|
|
031995 |
+ (len * size_in_bytes));
|
|
|
031995 |
break;
|
|
|
031995 |
}
|
|
|
031995 |
if (new_data)
|
|
|
031995 |
diff --git a/randr/rrproperty.c b/randr/rrproperty.c
|
|
|
031995 |
index c2fb9585c6..25469f57b2 100644
|
|
|
031995 |
--- a/randr/rrproperty.c
|
|
|
031995 |
+++ b/randr/rrproperty.c
|
|
|
031995 |
@@ -209,7 +209,7 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
|
|
|
031995 |
RRDestroyOutputProperty(prop);
|
|
|
031995 |
return BadAlloc;
|
|
|
031995 |
}
|
|
|
031995 |
- new_value.size = len;
|
|
|
031995 |
+ new_value.size = total_len;
|
|
|
031995 |
new_value.type = type;
|
|
|
031995 |
new_value.format = format;
|
|
|
031995 |
|
|
|
031995 |
@@ -226,7 +226,7 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
|
|
|
031995 |
case PropModePrepend:
|
|
|
031995 |
new_data = new_value.data;
|
|
|
031995 |
old_data = (void *) (((char *) new_value.data) +
|
|
|
031995 |
- (prop_value->size * size_in_bytes));
|
|
|
031995 |
+ (len * size_in_bytes));
|
|
|
031995 |
break;
|
|
|
031995 |
}
|
|
|
031995 |
if (new_data)
|
|
|
031995 |
--
|
|
|
031995 |
2.41.0
|
|
|
031995 |
|