summaryrefslogtreecommitdiff
path: root/xserver/pseudoramiX
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2017-10-14 09:20:43 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2017-10-14 09:20:43 +0000
commitef3dccc55e2d4ae4570905b59e15b660f4bb940d (patch)
tree9c76c4190dc17eeeed5f395af8627dd6be59a75e /xserver/pseudoramiX
parentb029c472bc655a08ca6e0ef2184950f44d2f7aca (diff)
MFC: Unvalidated lengths
v2: Add overflow check and remove unnecessary check (Julien Cristau) This addresses: CVE-2017-12184 in XINERAMA CVE-2017-12185 in MIT-SCREEN-SAVER CVE-2017-12186 in X-Resource CVE-2017-12187 in RENDER
Diffstat (limited to 'xserver/pseudoramiX')
-rw-r--r--xserver/pseudoramiX/pseudoramiX.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xserver/pseudoramiX/pseudoramiX.c b/xserver/pseudoramiX/pseudoramiX.c
index d8b259341..95f6e10c8 100644
--- a/xserver/pseudoramiX/pseudoramiX.c
+++ b/xserver/pseudoramiX/pseudoramiX.c
@@ -297,10 +297,11 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
TRACE;
+ REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+
if (stuff->screen >= pseudoramiXNumScreens)
return BadMatch;
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success)
return rc;