Attachment 49358 Details for Bug 113227

[patch] fixed malformed attachment #49158

p_CAN-2005-4095.diff (text/plain), 7.70 KB, created by Stefan Dirsch on 2005-09-09 11:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2005-09-09 11:17:11 UTC

Size: 7.70 KB

patch

obsolete

>Index: xc/programs/Xserver/afb/afbpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/afb/afbpixmap.c,v
>retrieving revision 1.5
>diff -u -p -u -r1.5 afbpixmap.c
>--- xc/programs/Xserver/afb/afbpixmap.c	3 Jul 2005 07:01:14 -0000	1.5
>+++ xc/programs/Xserver/afb/afbpixmap.c	26 Aug 2005 20:55:37 -0000
>@@ -77,10 +77,14 @@ afbCreatePixmap(pScreen, width, height,
> 	int				depth;
> {
> 	PixmapPtr pPixmap;
>-	int datasize;
>-	int paddedWidth;
>+	size_t datasize;
>+	size_t paddedWidth;
>
> 	paddedWidth = BitmapBytePad(width);
>+
>+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
>+	    return NullPixmap;
>+
> 	datasize = height * paddedWidth * depth;
> 	pPixmap = AllocatePixmap(pScreen, datasize);
> 	if (!pPixmap)
>Index: xc/programs/Xserver/cfb/cfbpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbpixmap.c,v
>retrieving revision 1.5
>diff -u -p -u -r1.5 cfbpixmap.c
>--- xc/programs/Xserver/cfb/cfbpixmap.c	3 Jul 2005 07:01:15 -0000	1.5
>+++ xc/programs/Xserver/cfb/cfbpixmap.c	26 Aug 2005 20:55:37 -0000
>@@ -72,10 +72,13 @@ cfbCreatePixmap (pScreen, width, height,
>     int		depth;
> {
>     PixmapPtr pPixmap;
>-    int datasize;
>-    int paddedWidth;
>+    size_t datasize;
>+    size_t paddedWidth;
>
>     paddedWidth = PixmapBytePad(width, depth);
>+
>+    if (paddedWidth / 4 > 32767 || height > 32767)
>+	return NullPixmap;
>     datasize = height * paddedWidth;
>     pPixmap = AllocatePixmap(pScreen, datasize);
>     if (!pPixmap)
>Index: xc/programs/Xserver/dix/dispatch.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/dix/dispatch.c,v
>retrieving revision 1.12
>diff -u -p -u -r1.12 dispatch.c
>--- xc/programs/Xserver/dix/dispatch.c	16 Jul 2005 20:52:25 -0000	1.12
>+++ xc/programs/Xserver/dix/dispatch.c	26 Aug 2005 20:55:38 -0000
>@@ -1483,6 +1483,23 @@ ProcCreatePixmap(register ClientPtr clie
> 	client->errorValue = 0;
>         return BadValue;
>     }
>+    if (stuff->width > 32767 || stuff->height > 32767)
>+    {
>+	/* It is allowed to try and allocate a pixmap which is larger than
>+	 * 32767 in either dimension. However, all of the framebuffer code
>+	 * is buggy and does not reliably draw to such big pixmaps, basically
>+	 * because the Region data structure operates with signed shorts
>+	 * for the rectangles in it.
>+	 *
>+	 * Furthermore, several places in the X server computes the
>+	 * size in bytes of the pixmap and tries to store it in an
>+	 * integer. This integer can overflow and cause the allocated size
>+	 * to be much smaller.
>+	 *
>+	 * So, such big pixmaps are rejected here with a BadAlloc
>+	 */
>+	return BadAlloc;
>+    }
>     if (stuff->depth != 1)
>     {
>         pDepth = pDraw->pScreen->allowedDepths;
>Index: xc/programs/Xserver/dix/pixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/dix/pixmap.c,v
>retrieving revision 1.7
>diff -u -p -u -r1.7 pixmap.c
>--- xc/programs/Xserver/dix/pixmap.c	3 Jul 2005 08:53:38 -0000	1.7
>+++ xc/programs/Xserver/dix/pixmap.c	26 Aug 2005 20:55:38 -0000
>@@ -116,8 +116,12 @@ AllocatePixmap(ScreenPtr pScreen, int pi
>     DevUnion *ppriv;
>     unsigned *sizes;
>     unsigned size;
>+    size_t alloc;
>     int i;
>
>+    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
>+	return NullPixmap;
>+
>     pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
>     if (!pPixmap)
> 	return NullPixmap;
>Index: xc/programs/Xserver/fb/fbpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpixmap.c,v
>retrieving revision 1.5
>diff -u -p -u -r1.5 fbpixmap.c
>--- xc/programs/Xserver/fb/fbpixmap.c	3 Jul 2005 07:01:23 -0000	1.5
>+++ xc/programs/Xserver/fb/fbpixmap.c	26 Aug 2005 20:55:38 -0000
>@@ -37,11 +37,13 @@ PixmapPtr
> {
>     PixmapPtr	pPixmap;
>-    int		datasize;
>-    int		paddedWidth;
>+    size_t	datasize;
>+    size_t	paddedWidth;
>     int		adjust;
>     int		base;
>
>     paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
>+    if (paddedWidth / 4 > 32767 || height > 32767)
>+	return NullPixmap;
>     datasize = height * paddedWidth;
> #ifdef PIXPRIV
>     base = pScreen->totalPixmapSize;
>Index: xc/programs/Xserver/ilbm/ilbmpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/ilbm/ilbmpixmap.c,v
>retrieving revision 1.4
>diff -u -p -u -r1.4 ilbmpixmap.c
>--- xc/programs/Xserver/ilbm/ilbmpixmap.c	3 Jul 2005 07:01:44 -0000	1.4
>+++ xc/programs/Xserver/ilbm/ilbmpixmap.c	26 Aug 2005 20:55:39 -0000
>@@ -79,10 +79,12 @@ ilbmCreatePixmap(pScreen, width, height,
> 	int				depth;
> {
> 	PixmapPtr pPixmap;
>-	int datasize;
>-	int paddedWidth;
>+	size_t datasize;
>+	size_t paddedWidth;
>
> 	paddedWidth = BitmapBytePad(width);
>+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
>+		return NullPixmap;
> 	datasize = height * paddedWidth * depth;
> 	pPixmap = AllocatePixmap(pScreen, datasize);
> 	if (!pPixmap)
>Index: xc/programs/Xserver/iplan2p4/iplpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/iplan2p4/iplpixmap.c,v
>retrieving revision 1.4
>diff -u -p -u -r1.4 iplpixmap.c
>--- xc/programs/Xserver/iplan2p4/iplpixmap.c	3 Jul 2005 07:01:46 -0000	1.4
>+++ xc/programs/Xserver/iplan2p4/iplpixmap.c	26 Aug 2005 20:55:39 -0000
>@@ -78,12 +78,14 @@ iplCreatePixmap (pScreen, width, height,
>     int		depth;
> {
>     PixmapPtr pPixmap;
>-    int datasize;
>-    int paddedWidth;
>+    size_t datasize;
>+    size_t paddedWidth;
>     int ipad=INTER_PLANES*2 - 1;
>
>     paddedWidth = PixmapBytePad(width, depth);
>     paddedWidth = (paddedWidth + ipad) & ~ipad;
>+    if (paddedWidth / 4 > 32767 || height > 32767)
>+	return NullPixmap;
>     datasize = height * paddedWidth;
>     pPixmap = AllocatePixmap(pScreen, datasize);
>     if (!pPixmap)
>Index: xc/programs/Xserver/mfb/mfbpixmap.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbpixmap.c,v
>retrieving revision 1.4
>diff -u -p -u -r1.4 mfbpixmap.c
>--- xc/programs/Xserver/mfb/mfbpixmap.c	3 Jul 2005 07:01:50 -0000	1.4
>+++ xc/programs/Xserver/mfb/mfbpixmap.c	26 Aug 2005 20:55:39 -0000
>@@ -75,12 +75,14 @@ mfbCreatePixmap (pScreen, width, height,
>     int		depth;
> {
>     PixmapPtr pPixmap;
>-    int datasize;
>-    int paddedWidth;
>+    size_t datasize;
>+    size_t paddedWidth;
>
>     if (depth != 1)
> 	return NullPixmap;
>     paddedWidth = BitmapBytePad(width);
>+    if (paddedWidth / 4 > 32767 || height > 32767)
>+	return NullPixmap;
>     datasize = height * paddedWidth;
>     pPixmap = AllocatePixmap(pScreen, datasize);
>     if (!pPixmap)
>--- xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig	2004-12-04 17:42:32.000000000 +0000
>+++ xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c	2005-09-09 11:00:30.000000000 +0000
>@@ -498,6 +498,9 @@
>     XAAPixmapPtr pPriv;
>     PixmapPtr pPix = NULL;
>     int size = w * h;
>+
>+    if (w > 32767 || h > 32767)
>+       return NullPixmap;
>     
>     if (!infoRec->offscreenDepthsInitialized)
> 	XAAInitializeOffscreenDepths (pScreen);
>--- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig	2004-12-04 17:42:47.000000000 +0000
>+++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	2005-09-09 11:01:45.000000000 +0000
>@@ -85,7 +85,7 @@
>     int		depth ;
> {
>     register PixmapPtr pPixmap  = (PixmapPtr)NULL;
>-    int size ;
>+    size_t size ;
>     
>     TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
> 
>@@ -93,6 +93,10 @@
> 	return (PixmapPtr) NULL ;
> 
>     size = PixmapBytePad(width, depth);
>+
>+    if (size / 4 > 32767 || height > 32767)
>+	return (PixmapPtr) NULL ;
>+
>     pPixmap = AllocatePixmap (pScreen, (height * size));
>     
>     if ( !pPixmap )

Actions: View | Diff

Attachments on bug 113227: 47712 | 49024 | 49158 | 49358 | 49778 | 50745 | 51310