Commit graph

123 commits

Author SHA1 Message Date
Matthias Hopf
5ef366e8eb CVE-2007-6429: Always test for size+offset wrapping.
(cherry picked from commit be6c17fcf9)
2008-01-21 15:57:33 -08:00
Adam Jackson
514c622618 CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
protected from overflow by the width and height checks.
(cherry picked from commit e9fa7c1c88)
2008-01-18 16:16:38 -08:00
Matthieu Herrb
ca82f294fc Fix for CVE-2007-5958 - File existence disclosure.
(cherry picked from commit 19b95cdd1d)
2008-01-17 11:18:26 -08:00
Matthieu Herrb
0dbe1a0902 Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
(cherry picked from commit 8b14f7b742)
2008-01-17 11:17:34 -08:00
Matthieu Herrb
6a493ecad3 Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
(cherry picked from commit 4848d49d05)
2008-01-17 09:50:48 -08:00
Matthieu Herrb
44c4bd5df3 CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
(cherry picked from commit 645d87cf8e)
2007-04-05 23:32:56 -07:00
Keith Packard
f8636dd4a2 Revert "Xext: Update device's lastx/lasty when sending a motion event with XTest."
This reverts commit 4c5837c940.
There is no lastx/lasty in a valuator on this branch.
2007-03-14 12:00:06 -07:00
Peter Hutterer
4c5837c940 Xext: Update device's lastx/lasty when sending a motion event with XTest.
(cherry picked from commit 68c64ad7b1)
2007-03-14 11:43:27 -07:00
Eamon Walsh
e6778fee47 More work on Bug #8875: revert previous fix and try using client argument
instead of serverClient.  Also don't use totalClientSize as it is not
initialized until after the first call to InitClient
(cherry picked from 3d39c02fe6 commit)
2006-11-06 21:31:21 -05:00
Eamon Walsh
3e39bae79f whitespace adjust
(cherry picked from 75fe0670eb1f71144246f1c20759d5878bbee00 commit)
2006-11-06 15:39:06 -05:00
Eamon Walsh
dca5274920 Bug #8875: Security extension causes Xorg to core dump on server reset
(cherry picked from 0539d9cf24 commit)
2006-11-06 15:37:50 -05:00
Eamon Walsh
49a70c8570 Merge branch 'master' into my-XACE-modular 2006-09-15 15:26:57 -04:00
Eamon Walsh
d1110c5c83 Generalize the handling of configuration files that ship with extensions. 2006-09-08 15:28:48 -04:00
Eamon Walsh
0fba09cdfc Include dix-config.h. 2006-09-08 15:23:06 -04:00
Eamon Walsh
c93877100e Don't need to allocate memory now that devPrivates are being used. 2006-09-08 15:21:57 -04:00
Michel Dänzer
f6ce0839ba Fix #include paths for fontcacheproto headers. 2006-09-06 13:18:02 +02:00
Eamon Walsh
0b81fccd2e Merge branch 'master' into my-XACE-modular
Conflicts:

	configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum
5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Eamon Walsh
13c6713c82 Add four new XACE hooks: auditing, key event notification, window init 2006-08-25 18:17:01 -04:00
Eamon Walsh
52ba722e4c Merge branch 'XACE-modular' into my-XACE-modular 2006-08-21 18:49:31 -04:00
Alan Coopersmith
c2535f6792 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-10 10:37:59 -07:00
Daniel Stone
12dbd8a02f remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
2006-08-07 23:43:40 +03:00
Eamon Walsh
45c229f526 Remove LBX code. 2006-08-03 14:26:06 -04:00
Eamon Walsh
96e45626c4 Rebase Security extension to use devPrivates for storing security state. 2006-08-02 20:29:59 -04:00
Matthew Allum
02daa6bb10 Improve XRes to;
- Better estimate general pixmap memory usage.
 - Account for pixmaps shared between clients.
 - Account for window background and border pixmaps,
   and GC stripple and tile pixmaps.
2006-07-31 17:32:05 +01:00
Daniel Stone
bf2d7499c8 add securitysrv.h 2006-07-30 11:17:02 +03:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Daniel Stone
f8a7a1e40c fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
2006-07-21 15:16:42 -04:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Eamon Walsh
f83cee0338 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-21 16:40:06 -07:00
Alan Coopersmith
90af38fa0c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Alan Coopersmith
77c947b900 Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
(Since all use is inside the xserver module, might as well keep the header
 in the Xserver module instead of in proto/XExt to allow easier synchronization
 of updates.)
2006-06-21 16:18:41 -07:00
Eamon Walsh
9af315a9be Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-20 19:03:05 -07:00
Alan Coopersmith
f68ecfa482 Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
   to build XC-Security without X-ACE
 - Added XACE #define to dix-config.h
 - Added X-ACE sources to Xext/Makefile.am
2006-06-20 19:01:34 -07:00
Alan Coopersmith
a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:22:51 -07:00
Alan Coopersmith
a544359465 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:14:27 -07:00
Alan Coopersmith
63f6e6bbfd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 16:03:34 -07:00
Alan Coopersmith
6df52fb774 Delete code that's been inside #if 0 since X11R6.7. 2006-06-20 16:02:55 -07:00
Eamon Walsh
227a319340 Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
 imported to modular cvs or git trees.)
2006-06-20 15:29:42 -07:00
Eamon Walsh
f818e0ab60 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000 commit)
2006-06-19 17:24:30 -07:00
Adam Jackson
71fbda8049 Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Greg Kroah-Hartman
96c19a3ec1 put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Greg Kroah-Hartman
101ae61696 Add PanoramiXExtensionDisabledHack to globals.h as it was missing. 2006-06-07 12:06:22 -07:00
Greg Kroah-Hartman
e5b72bd9c6 Remove 3 compiler warnings in the Xext/xevie.c file 2006-06-07 12:05:39 -07:00
Daniel Stone
ee71cb61f8 Bug #6956: Fix crash when removing session leader before its children.
(Rich Coe)
2006-06-03 10:54:38 +00:00
Daniel Stone
a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone
d81edb9e00 Forgot to remove this one too. 2006-06-01 19:22:01 +00:00
Daniel Stone
a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Søren Sandmann Pedersen
6558ba4e62 Fri May 12 17:51:26 2006 Søren Sandmann <sandmann@redhat.com>
Keep track of the previous item and update its next pointer when deleting
    from the linked list.
2006-05-12 21:53:28 +00:00