dix: integer overflow in REQUEST_FIXED_SIZE() [CVE-2014-8092 4/4]

Force use of 64-bit integers when evaluating data provided by clients in 32-bit fields which can overflow when added or multiplied during checks. Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> RHEL5: add #include <stdint.h> for uint64_t v3: backport to nx-libs 3.6.x (Mike DePaulo)

dix: integer overflow in REQUEST_FIXED_SIZE() [CVE-2014-8092 4/4]
82d7279e · Alan Coopersmith · Mike Gabriel · ed1e13a1 · 82d7279e
Commit 82d7279e authored Jan 22, 2014 by Alan Coopersmith Committed by Mike Gabriel Feb 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

dix.h nx-X11/programs/Xserver/include/dix.h +4 -1

No files found.
--- a/nx-X11/programs/Xserver/include/dix.h
+++ b/nx-X11/programs/Xserver/include/dix.h
@@ -50,6 +50,8 @@ SOFTWARE.
 #ifndef DIX_H
 #define DIX_H

+#include <stdint.h>
+
 #include "gc.h"
 #include "window.h"
 #include "input.h"
@@ -73,7 +75,8 @@ SOFTWARE.

 #define REQUEST_FIXED_SIZE(req, n)\
    if (((sizeof(req) >> 2) > client->req_len) || \
-        (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \
+        ((n >> 2) >= client->req_len) || \
+        ((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len))  \
         return(BadLength)

 #define LEGAL_NEW_RESOURCE(id,client)\