diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-11-27 16:27:49 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-12-13 11:42:25 +1000 |
| commit | aaf854fb25541380cc38a221c15f0e8372f48872 (patch) | |
| tree | 3cfbedcab29b47a40c7bd3f01e808b906c936798 /randr | |
| parent | eea4c7533663fd3ab19b34656d7b5e1b5feaa325 (diff) | |
randr: avoid integer truncation in length check of ProcRRChange*Property
Affected are ProcRRChangeProviderProperty and ProcRRChangeOutputProperty.
See also xserver@8f454b79 where this same bug was fixed for the core
protocol and XI.
This fixes an OOB read and the resulting information disclosure.
Length calculation for the request was clipped to a 32-bit integer. With
the correct stuff->nUnits value the expected request size was
truncated, passing the REQUEST_FIXED_SIZE check.
The server then proceeded with reading at least stuff->num_items bytes
(depending on stuff->format) from the request and stuffing whatever it
finds into the property. In the process it would also allocate at least
stuff->nUnits bytes, i.e. 4GB.
CVE-2023-6478, ZDI-CAN-22561
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
(cherry picked from commit 14f480010a93ff962fef66a16412fafff81ad632)
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/rrproperty.c | 2 | ||||
| -rw-r--r-- | randr/rrproviderproperty.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/randr/rrproperty.c b/randr/rrproperty.c index 25469f57b..c4fef8a1f 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -530,7 +530,7 @@ ProcRRChangeOutputProperty(ClientPtr client) char format, mode; unsigned long len; int sizeInBytes; - int totalSize; + uint64_t totalSize; int err; REQUEST_AT_LEAST_SIZE(xRRChangeOutputPropertyReq); diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c index b79c17f9b..90c5a9a93 100644 --- a/randr/rrproviderproperty.c +++ b/randr/rrproviderproperty.c @@ -498,7 +498,7 @@ ProcRRChangeProviderProperty(ClientPtr client) char format, mode; unsigned long len; int sizeInBytes; - int totalSize; + uint64_t totalSize; int err; REQUEST_AT_LEAST_SIZE(xRRChangeProviderPropertyReq); |