dbe: Unvalidated variable-length request in ProcDbeGetVisualInfo (CVE-2017-12177)
v2: Protect against integer overflow (Alan Coopersmith) Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Nathan Kidd <nkidd@opentext.com> Signed-off-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
parent
859b08d523
commit
4ca68b878e
|
@ -574,6 +574,9 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
||||||
XdbeScreenVisualInfo *pScrVisInfo;
|
XdbeScreenVisualInfo *pScrVisInfo;
|
||||||
|
|
||||||
REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
|
REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
|
||||||
|
if (stuff->n > UINT32_MAX / sizeof(CARD32))
|
||||||
|
return BadLength;
|
||||||
|
REQUEST_FIXED_SIZE(xDbeGetVisualInfoReq, stuff->n * sizeof(CARD32));
|
||||||
|
|
||||||
if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
|
if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
|
||||||
return BadAlloc;
|
return BadAlloc;
|
||||||
|
@ -924,7 +927,7 @@ SProcDbeSwapBuffers(ClientPtr client)
|
||||||
|
|
||||||
swapl(&stuff->n);
|
swapl(&stuff->n);
|
||||||
if (stuff->n > UINT32_MAX / sizeof(DbeSwapInfoRec))
|
if (stuff->n > UINT32_MAX / sizeof(DbeSwapInfoRec))
|
||||||
return BadAlloc;
|
return BadLength;
|
||||||
REQUEST_FIXED_SIZE(xDbeSwapBuffersReq, stuff->n * sizeof(xDbeSwapInfo));
|
REQUEST_FIXED_SIZE(xDbeSwapBuffersReq, stuff->n * sizeof(xDbeSwapInfo));
|
||||||
|
|
||||||
if (stuff->n != 0) {
|
if (stuff->n != 0) {
|
||||||
|
|
Loading…
Reference in New Issue