IABSD.fr/xenocara/lib/libX11/src/GetPntMap.c

Branch : - branch - master - tag -

• Show log

  Commit

• Author : matthieu
  Date : 2013-05-23 22:42:07
  Hash : 52f6d0ba
  Message : Merge upstream fixes for several X libs vulnerabilities discovered by Ilja van Sprundel. CVE-2013-1981 X.org libX11 1.5.99.901 (1.6 RC1) integer overflows CVE-2013-1982 X.org libXext 1.3.1 integer overflows CVE-2013-1983 X.org libXfixes 5.0 integer overflows CVE-2013-1984 X.org libXi 1.7.1 integer overflows CVE-2013-1985 X.org libXinerama 1.1.2 integer overflows CVE-2013-1986 X.org libXrandr 1.4.0 integer overflows CVE-2013-1987 X.org libXrender 0.9.7 integer overflows CVE-2013-1988 X.org libXRes 1.0.6 integer overflows CVE-2013-1989 X.org libXv 1.0.7 integer overflows CVE-2013-1990 X.org libXvMC 1.0.7 integer overflows CVE-2013-1991 X.org libXxf86dga 1.1.3 integer overflows CVE-2013-1992 X.org libdmx 1.1.2 integer overflows CVE-2013-1994 X.org libchromeXvMC & libchromeXvMCPro in openChrome 0.3.2 integer overflows CVE-2013-1995 X.org libXi 1.7.1 sign extension issues CVE-2013-1996 X.org libFS 1.0.4 sign extension issues CVE-2013-1997 X.org libX11 1.5.99.901 (1.6 RC1) buffer overflows CVE-2013-1998 X.org libXi 1.7.1 buffer overflows CVE-2013-1999 X.org libXvMC 1.0.7 buffer overflows CVE-2013-2000 X.org libXxf86dga 1.1.3 buffer overflows CVE-2013-2001 X.org libXxf86vm 1.1.2 buffer overflows CVE-2013-2002 X.org libXt 1.1.3 buffer overflows CVE-2013-2003 X.org libXcursor 1.1.13 integer overflows CVE-2013-2004 X.org libX11 1.5.99.901 (1.6 RC1) unbounded recursion CVE-2013-2005 X.org libXt 1.1.3 memory corruption CVE-2013-2066 X.org libXv 1.0.7 buffer overflows

• lib/libX11/src/GetPntMap.c

• /*
  
  Copyright 1986, 1998  The Open Group
  
  Permission to use, copy, modify, distribute, and sell this software and its
  documentation for any purpose is hereby granted without fee, provided that
  the above copyright notice appear in all copies and that both that
  copyright notice and this permission notice appear in supporting
  documentation.
  
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  
  Except as contained in this notice, the name of The Open Group shall not be
  used in advertising or otherwise to promote the sale, use or other dealings
  in this Software without prior written authorization from The Open Group.
  
  */
  
  
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
  #include "Xlibint.h"
  #include <limits.h>
  
  #ifdef MIN		/* some systems define this in <sys/param.h> */
  #undef MIN
  #endif
  #define MIN(a, b) ((a) < (b) ? (a) : (b))
  
  int XGetPointerMapping (
      register Display *dpy,
      unsigned char *map,	/* RETURN */
      int nmaps)
  
  {
      unsigned char mapping[256];	/* known fixed size */
      unsigned long nbytes, remainder = 0;
      xGetPointerMappingReply rep;
      register xReq *req;
  
      LockDisplay(dpy);
      GetEmptyReq(GetPointerMapping, req);
      if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
  	UnlockDisplay(dpy);
  	SyncHandle();
  	return 0;
      }
  
      /* Don't count on the server returning a valid value */
      if (rep.length >= (INT_MAX >> 2)) {
  	_XEatDataWords(dpy, rep.length);
  	UnlockDisplay(dpy);
  	SyncHandle();
  	return 0;
      }
  
      nbytes = (unsigned long) rep.length << 2;
      if (nbytes > sizeof mapping) {
  	remainder = nbytes - sizeof mapping;
  	nbytes = sizeof mapping;
      }
      _XRead (dpy, (char *)mapping, nbytes);
      /* don't return more data than the user asked for. */
      if (rep.nElts) {
  	    memcpy ((char *) map, (char *) mapping,
  		MIN((int)rep.nElts, nmaps) );
  	}
  
      if (remainder)
  	_XEatData(dpy, remainder);
  
      UnlockDisplay(dpy);
      SyncHandle();
      return ((int) rep.nElts);
  }
  
  KeySym *
  XGetKeyboardMapping (Display *dpy,
  #if NeedWidePrototypes
  			     unsigned int first_keycode,
  #else
  			     KeyCode first_keycode,
  #endif
  			     int count,
  			     int *keysyms_per_keycode)
  {
      unsigned long nbytes;
      CARD32 nkeysyms;
      register KeySym *mapping = NULL;
      xGetKeyboardMappingReply rep;
      register xGetKeyboardMappingReq *req;
  
      LockDisplay(dpy);
      GetReq(GetKeyboardMapping, req);
      req->firstKeyCode = first_keycode;
      req->count = count;
      if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) {
  	UnlockDisplay(dpy);
  	SyncHandle();
  	return (KeySym *) NULL;
      }
  
      nkeysyms = rep.length;
      if (nkeysyms > 0) {
  	if (nkeysyms < (INT_MAX / sizeof (KeySym))) {
  	    nbytes = nkeysyms * sizeof (KeySym);
  	    mapping = Xmalloc (nbytes);
  	}
  	if (! mapping) {
  	    _XEatDataWords(dpy, rep.length);
  	    UnlockDisplay(dpy);
  	    SyncHandle();
  	    return (KeySym *) NULL;
  	}
  	nbytes = nkeysyms << 2;
  	_XRead32 (dpy, (long *) mapping, nbytes);
      }
      *keysyms_per_keycode = rep.keySymsPerKeyCode;
      UnlockDisplay(dpy);
      SyncHandle();
      return (mapping);
  }