1 From 475a39f6ac52aa2dc1babfece38d73da1a478731 Mon Sep 17 00:00:00 2001
2 From: Adam Jackson <ajax@redhat.com>
3 Date: Mon, 10 Nov 2014 12:13:46 -0500
4 Subject: [PATCH 30/33] glx: Length-checking for non-generated vendor private
5 requests [CVE-2014-8098 6/8]
7 Reviewed-by: Keith Packard <keithp@keithp.com>
8 Reviewed-by: Michal Srb <msrb@suse.com>
9 Reviewed-by: Andy Ritger <aritger@nvidia.com>
10 Signed-off-by: Adam Jackson <ajax@redhat.com>
11 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
13 glx/indirect_program.c | 2 ++
14 glx/swap_interval.c | 2 ++
15 2 files changed, 4 insertions(+)
17 --- a/glx/indirect_program.c
18 +++ b/glx/indirect_program.c
19 @@ -56,6 +56,8 @@ DoGetProgramString(struct __GLXclientSta
20 __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
21 ClientPtr client = cl->client;
23 + REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
25 pc += __GLX_VENDPRIV_HDR_SIZE;
28 --- a/glx/swap_interval.c
29 +++ b/glx/swap_interval.c
30 @@ -46,6 +46,8 @@ DoSwapInterval(__GLXclientState * cl, GL
34 + REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
36 cx = __glXLookupContextByTag(cl, tag);
38 if ((cx == NULL) || (cx->pGlxScreen == NULL)) {