diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-03-02 11:04:44 -0800 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-12 09:34:39 +0200 |
| commit | e27df80700727725aea6c03986fa10e4ed0c6d65 (patch) | |
| tree | 98819657f851a6d85e58020c2ae902312c1162cd /nx-X11/lib/X11/XKBGetMap.c | |
| parent | 7564bf7efc93b87da7a512a0ba205c9d1d26ff36 (diff) | |
| download | nx-libs-e27df80700727725aea6c03986fa10e4ed0c6d65.tar.gz nx-libs-e27df80700727725aea6c03986fa10e4ed0c6d65.tar.bz2 nx-libs-e27df80700727725aea6c03986fa10e4ed0c6d65.zip | |
unvalidated index in _XkbReadExplicitComponents() [CVE-2013-1997 9/15]
If the X server returns key indexes outside the range of the number of
keys it told us to allocate, out of bounds memory writes could occur.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/XKBGetMap.c')
| -rw-r--r-- | nx-X11/lib/X11/XKBGetMap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/X11/XKBGetMap.c index 56f068dbf..5705f2649 100644 --- a/nx-X11/lib/X11/XKBGetMap.c +++ b/nx-X11/lib/X11/XKBGetMap.c @@ -363,8 +363,10 @@ register int i; unsigned char *wire; if ( rep->totalKeyExplicit>0 ) { + int size = xkb->max_key_code + 1; + if ( ((int) rep->firstKeyExplicit + rep->nKeyExplicit) > size) + return BadLength; if ( xkb->server->explicit == NULL ) { - int size = xkb->max_key_code+1; xkb->server->explicit = _XkbTypedCalloc(size,unsigned char); if (xkb->server->explicit==NULL) return BadAlloc; @@ -378,6 +380,8 @@ unsigned char *wire; if (!wire) return BadLength; for (i=0;i<rep->totalKeyExplicit;i++,wire+=2) { + if (wire[0] > xkb->max_key_code || wire[1] > xkb->max_key_code) + return BadLength; xkb->server->explicit[wire[0]]= wire[1]; } } |