| 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] |
| 6 | |
| 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> |
| 12 | --- |
| 13 | glx/indirect_program.c | 2 ++ |
| 14 | glx/swap_interval.c | 2 ++ |
| 15 | 2 files changed, 4 insertions(+) |
| 16 | |
| 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; |
| 22 | |
| 23 | + REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8); |
| 24 | + |
| 25 | pc += __GLX_VENDPRIV_HDR_SIZE; |
| 26 | if (cx != NULL) { |
| 27 | GLenum target; |
| 28 | --- a/glx/swap_interval.c |
| 29 | +++ b/glx/swap_interval.c |
| 30 | @@ -46,6 +46,8 @@ DoSwapInterval(__GLXclientState * cl, GL |
| 31 | __GLXcontext *cx; |
| 32 | GLint interval; |
| 33 | |
| 34 | + REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4); |
| 35 | + |
| 36 | cx = __glXLookupContextByTag(cl, tag); |
| 37 | |
| 38 | if ((cx == NULL) || (cx->pGlxScreen == NULL)) { |