libxxf86dga: Changes to 'upstream-unstable'
autogen.sh |4 +-
configure.ac |9 -
src/XF86DGA2.c | 86 +++--
3 files changed, 75 insertions(+), 24 deletions(-)
New commits:
commit 0f2e21d7e8310cf7bc02bba56884be0e52c061ae
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Thu May 30 18:36:19 2013 -0700
libXxf86dga 1.1.4
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/configure.ac b/configure.ac
index 955fa3c..3127c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXxf86dga], [1.1.3],
+AC_INIT([libXxf86dga], [1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXxf86dga])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
commit a8dc6be3213bc91dec5e25535ef4bad5a9456af0
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Sat Apr 13 12:53:49 2013 -0700
integer overflow in XDGAOpenFramebuffer()
rep.length is a CARD32 and should be bounds checked before left shifting
to come up with the size to allocate and read from the network, though
since both functions take the same size, there should be no way for the
buffer to be overflowed in this case.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 4d13677..9c656e6 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -250,9 +250,14 @@ Bool XDGAOpenFramebuffer(
return False;
}
-if(rep.length) {
- deviceName = Xmalloc(rep.length 2);
- _XRead(dpy, deviceName, rep.length 2);
+if (rep.length) {
+ if (rep.length (INT_MAX 2)) {
+ unsigned long size = rep.length 2;
+ deviceName = Xmalloc(size);
+ _XRead(dpy, deviceName, size);
+ deviceName[size - 1] = '\0';
+ } else
+ _XEatDataWords(dpy, rep.length);
}
ret = XDGAMapFramebuffer(screen, deviceName,
commit b69d6d51a82b1d1e8c68a233360acb742c879375
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Sat Apr 13 12:45:41 2013 -0700
buffer overflow in XDGASetMode() [CVE-2013-2000 2/2]
When reading the name strings for the mode off the network, we never
checked to make sure the length of the name strings didn't overflow
the size of the buffer we'd allocated based on the reported rep.length
for the total reply size.
Reported-by: Ilja Van Sprundel ivansprun...@ioactive.com
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 90ca918..4d13677 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -444,8 +444,14 @@ XDGASetMode(
dev-mode.reserved1 = info.reserved1;
dev-mode.reserved2 = info.reserved2;
- dev-mode.name = (char*)(dev[1]);
- _XRead(dpy, dev-mode.name, info.name_size);
+ if (info.name_size 0 info.name_size = size) {
+ dev-mode.name = (char*)(dev[1]);
+ _XRead(dpy, dev-mode.name, info.name_size);
+ dev-mode.name[info.name_size - 1] = '\0';
+ } else {
+ dev-mode.name = NULL;
+ _XEatDataWords(dpy, rep.length);
+ }
dev-pixmap = (rep.flags XDGAPixmap) ? pid : 0;
dev-data = XDGAGetMappedMemory(screen);
commit f89cf306a60facdf102696840bc05acebd7d1772
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Sat Apr 13 12:38:25 2013 -0700
integer overflow underflow in XDGASetMode() [CVE-2013-1991 2/2]
rep.length is a CARD32 and needs to be bounds checked before bit shifting
and subtracting sz_xXDGAModeInfo to come up with the total size to allocate,
to avoid integer overflow or underflow leading to underallocation and
writing data from the network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel ivansprun...@ioactive.com
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index b5145ee..90ca918 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -405,12 +405,15 @@ XDGASetMode(
if (_XReply(dpy, (xReply *)rep, 0, xFalse)) {
if(rep.length) {
xXDGAModeInfo info;
- int size;
+ unsigned long size;
- size = rep.length 2;
- size -= sz_xXDGAModeInfo; /* get text size */
+ if ((rep.length (INT_MAX 2))
+ (rep.length (sz_xXDGAModeInfo 2))) {
+ size = rep.length 2;
+ size -= sz_xXDGAModeInfo; /* get text size */
- dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size);
+ dev = Xmalloc(sizeof(XDGADevice) + size);
+ }
if(dev) {
_XRead(dpy, (char*)(info), sz_xXDGAModeInfo);
@@ -451,6 +454,8 @@ XDGASetMode(
libxxf86dga: Changes to 'upstream-unstable'
configure.ac | 32 ++--
include/X11/extensions/Xxf86dga.h |2 -
include/X11/extensions/xf86dga1.h |2 -
man/XDGA.man | 14
src/Makefile.am |2 -
src/XF86DGA.c | 36 +++---
src/XF86DGA2.c| 60 +++---
7 files changed, 75 insertions(+), 73 deletions(-)
New commits:
commit 3dad5d7c34c5787f0466b9ff50d7c26cd18e37bd
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Wed Mar 7 21:34:06 2012 -0800
libXxf86dga 1.1.3
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/configure.ac b/configure.ac
index 7f9b97c..54585c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXxf86dga], [1.1.2],
+AC_INIT([libXxf86dga], [1.1.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXxf86dga])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
commit 870a35db2ad6eab47d1026a56e52c3f53a9877eb
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Thu Nov 10 21:50:52 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 71484b7..4544507 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -65,7 +65,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#include X11/extensions/extutil.h
extern XExtDisplayInfo* xdga_find_display(Display*);
-extern char *xdga_extension_name;
+extern const char *xdga_extension_name;
#define XF86DGACheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xdga_extension_name, val)
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index fbc84cb..e81b486 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -25,7 +25,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
/* If you change this, change the Bases[] array below as well */
#define MAX_HEADS 16
-char *xdga_extension_name = XF86DGANAME;
+const char *xdga_extension_name = XF86DGANAME;
static XExtensionInfo _xdga_info_data;
static XExtensionInfo *xdga_info = _xdga_info_data;
@@ -760,7 +760,7 @@ typedef struct _DGAMapRec{
} DGAMapRec, *DGAMapPtr;
static Bool
-DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr);
+DGAMapPhysical(int, const char*, unsigned char*, CARD32, CARD32, CARD32,
DGAMapPtr);
static void DGAUnmapPhysical(DGAMapPtr);
static DGAMapPtr _Maps = NULL;
@@ -852,7 +852,7 @@ XDGAUnmapFramebuffer(int screen)
static Bool
DGAMapPhysical(
int screen,
- char *name, /* optional device name */
+ const char *name, /* optional device name */
unsigned char* base,/* physical memory */
CARD32 size,/* size */
CARD32 offset, /* optional offset */
commit e9936bbcfe7ae6430ec91fd5fca696c09f2b904c
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Fri Sep 16 22:57:14 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/include/X11/extensions/Xxf86dga.h
b/include/X11/extensions/Xxf86dga.h
index 3b14ff3..d78a032 100644
--- a/include/X11/extensions/Xxf86dga.h
+++ b/include/X11/extensions/Xxf86dga.h
@@ -150,7 +150,7 @@ int XDGAGetViewportStatus(
Display*dpy,
intscreen
);
-
+
void XDGASync(
Display*dpy,
intscreen
diff --git a/include/X11/extensions/xf86dga1.h
b/include/X11/extensions/xf86dga1.h
index 0fc97aa..8110438 100644
--- a/include/X11/extensions/xf86dga1.h
+++ b/include/X11/extensions/xf86dga1.h
@@ -37,7 +37,7 @@ Status XF86DGAGetVideoLL(
unsigned int * /* base addr */,
int * /* width */,
int * /* bank_size */,
-int * /* ram_size */
+int * /* ram_size */
);
Status XF86DGAGetVideo(
diff --git a/man/XDGA.man b/man/XDGA.man
index 2121787..4510bcd 100644
--- a/man/XDGA.man
+++ b/man/XDGA.man
@@ -1,4 +1,4 @@
-.\
+.\
.TH XDGA 3 __vendorversion__
.SH NAME
XDGA \- Client library for the XFree86-DGA extension.
@@ -230,7 +230,7 @@ Each
corresponds to a different framebuffer layout.
.PP
.BR XDGAQueryModes ()
-returns a pointer to an array of
+returns a pointer to an array of
.IR XDGAMode s
which are valid for the given screen.
.I num
@@ -382,7 +382,7 @@ function.
.I maxViewportX
.TP 8
.I maxViewportY
-The maximum x and y positions possible with the
+The maximum x and y positions possible with the
.BR XDGASetViewport ()
function.
.TP 8
diff --git a/src/Makefile.am b/src/Makefile.am
index edfb90a..fbde550 100644
--- a/src/Makefile.am
+++
libxxf86dga: Changes to 'upstream-unstable'
.gitignore | 73 +++ COPYING | 22 +-- Makefile.am | 10 +-- configure.ac| 16 ++--- man/Makefile.am | 125 man/XDGA.man|1 man/XDGAChangePixmapMode.man|1 man/XDGACloseFramebuffer.man|1 man/XDGACopyArea.man|1 man/XDGACopyTransparentArea.man |1 man/XDGACreateColormap.man |1 man/XDGAFillRectangle.man |1 man/XDGAGetViewportStatus.man |1 man/XDGAInstallColormap.man |1 man/XDGAKeyEventToXKeyEvent.man |1 man/XDGAOpenFramebuffer.man |1 man/XDGAQueryExtension.man |1 man/XDGAQueryModes.man |1 man/XDGAQueryVersion.man|1 man/XDGASelectInput.man |1 man/XDGASetClientVersion.man|1 man/XDGASetMode.man |1 man/XDGASetViewport.man |1 man/XDGASync.man|1 man/XF86DGA.man |1 man/XFree86-DGA.man |1 src/Makefile.am |6 + src/XF86DGA.c |3 src/XF86DGA2.c |3 29 files changed, 167 insertions(+), 112 deletions(-) New commits: commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9 Author: Alan Coopersmith alan.coopersm...@oracle.com Date: Fri Oct 29 18:00:17 2010 -0700 libXxf86dga 1.1.2 Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com diff --git a/configure.ac b/configure.ac index 677ef6a..9ac50b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.60]) -AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga) +AC_INIT([libXxf86dga], [1.1.2], +[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +[libXxf86dga]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 967c47b8e431e1b4a25b3436ba4e130cc7eee5b5 Author: Alan Coopersmith alan.coopersm...@oracle.com Date: Fri Oct 29 17:58:37 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com diff --git a/man/Makefile.am b/man/Makefile.am index 624b17c..7b12599 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the Software), @@ -19,7 +19,7 @@ # 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. -# +# libmandir = $(LIB_MAN_DIR) commit a9cad8418292ee2291004d2c9ada7547120b53fd Author: Jesse Adkins jesserayadk...@gmail.com Date: Tue Sep 28 13:30:04 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins jesserayadk...@gmail.com Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com diff --git a/man/XDGA.man b/man/XDGA.man index 9c7beef..5bff838 100644 --- a/man/XDGA.man +++ b/man/XDGA.man @@ -1,4 +1,3 @@ -.\ $XFree86$ .\ .TH XDGA 3 __vendorversion__ .SH NAME diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index 2fd09a5..d241ff7 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */ /* Copyright (c) 1995 Jon Tombs commit a8a764e1c41a8f261f768e9ac2ef24e23ba6eedd Author: Gaetan Nadon mems...@videotron.ca Date: Tue Aug 17 14:37:23 2010 -0400 man: store shadow man pages in git rather than generating them Simplify the build process and the makefile. Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon mems...@videotron.ca diff --git a/man/Makefile.am b/man/Makefile.am index 457ac58..624b17c 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,47 +23,39 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - -libman_PRE = XDGA.man - -BUILT_SOURCES = $(XDGA_shadowmen) +libman_PRE = \ + XDGA.man\ + $(XDGA_shadows:=.man) + +XDGA_functions = \ + XDGAQueryExtension \ + XDGAQueryVersion\ + XDGAQueryModes \ + XDGASetMode \ + XDGAOpenFramebuffer \ + XDGACloseFramebuffer\ + XDGASetViewport \ + XDGAInstallColormap \ + XDGACreateColormap \ + XDGASelectInput \ + XDGAFillRectangle
libxxf86dga: Changes to 'upstream-unstable'
.gitignore| 12 ++ ChangeLog | 64 - Makefile.am | 10 +- README| 25 + configure.ac | 11 +- include/X11/extensions/Xxf86dga.h | 176 ++ include/X11/extensions/xf86dga1.h | 115 man/.gitignore|3 man/Makefile.am |1 src/.gitignore|9 - src/Makefile.am |8 + src/XF86DGA.c |5 - src/XF86DGA2.c|5 - 13 files changed, 355 insertions(+), 89 deletions(-) New commits: commit 990b19154368d9a1733636367d6a99d863d558ee Author: Peter Hutterer peter.hutte...@who-t.net Date: Tue Oct 6 16:14:45 2009 +1000 libXxf86dga 1.1.1 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index f34bf25..0e1341e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga) +AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 3cfcfc6246fb213bb0edf529b4f2b40907e5161c Author: Peter Hutterer peter.hutte...@who-t.net Date: Tue Oct 6 15:38:27 2009 +1000 Include Xxf86dga.h, not xf86dga. f78f3ed3571ab0bd75753a7ab388120a383d894a removed xf86dga.h and instead provided Xxf86dga.h. Let's use it! Also, remove two superfluous includes, including it once per file is enough. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/src/XF86DGA.c b/src/XF86DGA.c index 4fedd12..a6e66a4 100644 --- a/src/XF86DGA.c +++ b/src/XF86DGA.c @@ -62,7 +62,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #define NEED_EVENTS #define NEED_REPLIES #include X11/Xlibint.h -#include X11/extensions/xf86dga.h +#include X11/extensions/Xxf86dga.h #include X11/extensions/xf86dgaproto.h #include X11/extensions/Xext.h #include X11/extensions/extutil.h @@ -342,7 +342,6 @@ Bool XF86DGAViewPortChanged( /* Helper functions */ #include X11/Xmd.h -#include X11/extensions/xf86dga.h #include stdlib.h #include stdio.h #include fcntl.h diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index 5eb5aad..8425faa 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #define NEED_EVENTS #define NEED_REPLIES #include X11/Xlibint.h -#include X11/extensions/xf86dga.h +#include X11/extensions/Xxf86dga.h #include X11/extensions/xf86dgaproto.h #include X11/extensions/Xext.h #include X11/extensions/extutil.h @@ -710,7 +710,6 @@ void XDGAKeyEventToXKeyEvent( } #include X11/Xmd.h -#include X11/extensions/xf86dga.h #include stdlib.h #include stdio.h #include fcntl.h commit 0bd51760a0d92181faedbd52e7d7249c8179f95d Author: Peter Hutterer peter.hutte...@who-t.net Date: Tue Oct 6 15:34:22 2009 +1000 Actually use XORG_DEFAULT_OPTIONS For some reason, this part didn't make it into 8eab9123467b047f2b4ddec7df48a679c9254ca1. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index 57821ef..f34bf25 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(src/config.h) @@ -12,16 +12,13 @@ AM_CONFIG_HEADER(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto = 2.0.99.2]) XXF86DGA_CFLAGS=$CWARNFLAGS $XXF86DGA_CFLAGS XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile commit 5bf5c3c78963cec3cd22e445c62cc7cfd2a37df2 Author: Peter Hutterer peter.hutte...@who-t.net Date: Thu Oct 1 22:34:39 2009 +1000 libXxf86dga 1.1 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index fee26a2..57821ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT(libXxf86dga, 1.0.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga) +AC_INIT(libXxf86dga, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit
libxxf86dga: Changes to 'upstream-unstable'
.gitignore|1 +
configure.ac |4 ++--
src/XF86DGA.c |6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 5968e0f1e992db63b003f2389657cd527a806efd
Author: Eric Anholt [EMAIL PROTECTED]
Date: Wed Sep 5 10:17:57 2007 -0700
Bump to 1.0.2 and require updated xf86dgaproto for the prototype update.
diff --git a/configure.ac b/configure.ac
index 4f24e26..03939ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -11,7 +11,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext xf86dgaproto)
+PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto = 2.0.3])
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
commit 625a9c61265cdd1de3da425843a1a8de80d67c78
Author: James Cloos [EMAIL PROTECTED]
Date: Mon Sep 3 05:53:50 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 7250f89..912f131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ MakeOut
missing
mkinstalldirs
xxf86dga.pc
+*~
commit b3d86af10895f30ffb2999c28c5864b2be8681f6
Author: Wang Zhenyu [EMAIL PROTECTED]
Date: Wed Apr 18 09:35:56 2007 +0800
Fix sign extension bug on x86_64 system.
In XF86DGAGetVideoLL(), we pass offset param as 'int' type, but
later we cast it to 'unsigned long' in calling MapPhysAddress().
This causes page table error on x86_64 system like below:
dga: Corrupted page table at address 2b9712b1b000
PGD 702a4067 PUD 6f830067 PMD 6f864067 PTE 80040027
Bad pagetable: 000f [1] SMP
CPU 0
Modules linked in: i915 drm dm_mirror dm_mod video button battery asus_acpi
ac parport_pc parport nvram uhci_hcd ehci_hcd snd_hda_intel snd_hda_codec
snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss
snd_mixer_oss pcspkr snd_pcm i2c_i801 i2c_core e1000 snd_timer snd soundcore
snd_page_alloc
Pid: 2509, comm: dga Not tainted 2.6.21-rc6 #2
RIP: 0033:[003d119754a0] [003d119754a0]
RSP: 002b:7fff98f0d4c8 EFLAGS: 00010202
RAX: 8000 RBX: 0001 RCX: 2b9712b1b000
RDX: 0020 RSI: 0071 RDI: 2b9712b1b000
RBP: R08: 7171717171717171 R09:
R10: R11: 003d119753e0 R12:
R13: 7fff98f0d730 R14: 00503010 R15:
FS: 2b9712b19f60() GS:8060d000() knlGS:
CS: 0010 DS: ES: CR0: 8005003b
CR2: 2b9712b1b000 CR3: 6ffdb000 CR4: 06e0
Process dga (pid: 2509, threadinfo 8100718de000, task 81006ffd67a0)
RIP [003d119754a0]
RSP 7fff98f0d4c8
This patch requires latest xf86dgaproto to build.
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 95d7596..573a53f 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -98,7 +98,7 @@ Bool XF86DGAQueryVersion(
Bool XF86DGAGetVideoLL(
Display* dpy,
int screen,
-int *offset,
+unsigned int *offset,
int *width,
int *bank_size,
int *ram_size
@@ -120,7 +120,7 @@ Bool XF86DGAGetVideoLL(
return False;
}
-*offset = /*(char *)*/rep.offset;
+*offset = rep.offset;
*width = rep.width;
*bank_size = rep.bank_size;
*ram_size = rep.ram_size;
@@ -678,7 +678,7 @@ XF86DGAGetVideo(
int *bank,
int *ram
){
-/*unsigned long*/ int offset;
+unsigned int offset;
static int beenHere = 0;
ScrPtr sp;
MapPtr mp;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxxf86dga: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 316e02ab0bd590851c80e3028150f2a6a5a36708 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Jul 13 14:59:12 2006 -0700 renamed: .cvsignore - .gitignore commit b5be6bc7a5b5527f86dfd224e89a7c1561845131 Author: Adam Jackson [EMAIL PROTECTED] Date: Thu Apr 27 00:25:08 2006 + Bump to 1.0.1 commit 9ec9ba4c4539b27d819553fa4be73745b4fdfbf7 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Sun Feb 12 18:19:23 2006 + Bug #5628 https://bugs.freedesktop.org/show_bug.cgi?id=5628 Shadow pages not created correctly when MANDIR MANSUFFIX don't match. commit 5ab70ae500ec62fc89c7fa783f60db87d8b934a7 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:35 2005 + Update package version number for final X11R7 release candidate. commit a31ecfdc3fde5b217f06cf3351bb12b37f5f7882 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:45 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit a3121e6147f16eb72c9df262c7735191c98626bd Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:45 2005 + Update package version number for X11R7 RC3 release. commit 47a9625fe9e29c4ead2b7209c0d064aeff415eaf Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 04:41:51 2005 + Add check and cflags for malloc(0) returning NULL. commit dbd43adfb46efddc1380895e192d96982470cb4d Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:03:06 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit 81f335d928ea693c6dff24c2a170010959b1cc1d Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Nov 19 07:15:43 2005 + Update pkgconfig files to separate library build-time dependencies from application build-time dependencies, and update package deps to work with separate build roots. commit a346dd66fdfe04d2cb41bd2f7869f1c6b90e5941 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:19:13 2005 + Update package version number for X11R7 RC2 release. commit 70330a9bf76526353725e50233faafa14efcde16 Author: Kean Johnson [EMAIL PROTECTED] Date: Tue Nov 8 06:33:25 2005 + See ChangeLog entry 2005-11-07 for details. commit 01d7b50a520e92449afaabaed5d331db9c49084e Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:12 2005 + Update package version number for RC1 release. commit b0171fe11db042bccc7eaf2c0a88c3640eba6974 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:00:09 2005 + Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to work better with BSD make commit 32bf677cabd0641aa6bdcfbf58ec782133cc97ff Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 21:13:22 2005 + Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a suffix rule (reported by Matthieu Herrb) commit 04020960fd2baa35a0e3546a536fe196f9e0d13d Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Oct 13 04:25:46 2005 + Add generated man pages to .cvsignores commit 03c9007c310c8ca72d4c01a64f20c92bc581d688 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Wed Oct 12 01:18:25 2005 + Use sed to put version number in man page Add shadow man pages for man pages that document multiple functions. commit 4ce6461553712f7e966e874607225e57cd35e7eb Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Jul 29 21:22:53 2005 + Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version commit b56fac0b07195082ca94f6745b890151ad7b Author: Keith Packard [EMAIL PROTECTED] Date: Sat Jul 9 21:05:22 2005 + Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory commit 2343f1171cb1a36e47622395965d072a0ce78db7 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Fri Jul 1 16:16:15 2005 + spell freedesktop.org correctly commit 139215564ee6e63101858b9481f3413361a6d4a7 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Fri Jun 10 22:38:47 2005 + Apply patch from Jeff Smith ([EMAIL PROTECTED]): - Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm. - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm. commit 177b9f5cb3c9108d9547731721efb8cd6064b753 Author: Egbert Eich [EMAIL PROTECTED] Date: Thu May 6 17:31:17 2004 + BugZilla #601: Fixing makedepend choking on floating point exception because CHAR_BIT is
