diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-01-22 23:44:46 -0800 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:14:32 +0100 |
| commit | 82d7279ebfa04f319e68145b3adbf65716e59584 (patch) | |
| tree | 2d63c97d71d853d727ec05df90267b821d61cfd2 | |
| parent | ed1e13a1f4e316bcf0dc0d4b2c16b1df3f075005 (diff) | |
| download | nx-libs-82d7279ebfa04f319e68145b3adbf65716e59584.tar.gz nx-libs-82d7279ebfa04f319e68145b3adbf65716e59584.tar.bz2 nx-libs-82d7279ebfa04f319e68145b3adbf65716e59584.zip | |
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)
| -rw-r--r-- | nx-X11/programs/Xserver/include/dix.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h index 1b8fc4265..d82979c86 100644 --- 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)\ |