1 From c12a45abf1ae41f5deca298489f5e76ac54f2121 Mon Sep 17 00:00:00 2001
2 From: Julien Cristau <jcristau@debian.org>
3 Date: Tue, 28 Oct 2014 10:30:04 +0100
4 Subject: [PATCH 14/33] render: check request size before reading it
7 Otherwise we may be reading outside of the client request.
9 Signed-off-by: Julien Cristau <jcristau@debian.org>
10 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
11 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
13 render/render.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
16 diff --git a/render/render.c b/render/render.c
17 index e3031da..200e0c8 100644
20 @@ -276,11 +276,11 @@ ProcRenderQueryVersion(ClientPtr client)
22 REQUEST(xRenderQueryVersionReq);
24 + REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
26 pRenderClient->major_version = stuff->majorVersion;
27 pRenderClient->minor_version = stuff->minorVersion;
29 - REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
31 if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
32 (SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) {
33 rep.majorVersion = stuff->majorVersion;