Skip to content

Commit a1a1aa2

Browse files
committed
Fix XChangeFeedbackControl() request underflow
CVE-2021-3472 / ZDI-CAN-1259 This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative Signed-off-by: Matthieu Herrb <[email protected]>
1 parent 8890c44 commit a1a1aa2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Xi/chgfctl.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,11 @@ ProcXChangeFeedbackControl(ClientPtr client)
464464
break;
465465
case StringFeedbackClass:
466466
{
467-
xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
467+
xStringFeedbackCtl *f;
468468

469+
REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq,
470+
sizeof(xStringFeedbackCtl));
471+
f = ((xStringFeedbackCtl *) &stuff[1]);
469472
if (client->swapped) {
470473
if (len < bytes_to_int32(sizeof(xStringFeedbackCtl)))
471474
return BadLength;

0 commit comments

Comments
 (0)