frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,120 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

128 Commits

Author SHA1 Message Date
Eamon Walsh 3481b32ab9 security: Fix a crash caused by wrong ordering of format arguments. 2009-04-16 23:46:01 -04:00
Eamon Walsh 6045506be0 security: Revert behavior of extension access for compatibility. 
Previously, three extensions were defined as "trusted" by the extension:
BIG-REQUESTS, XC-MISC, and XPrint.  No other extensions were permitted
to be used by untrusted clients.

In commit 8b5d21cc1d this was changed for
some reason.  Return to the old, compatible behavior.
 2009-04-16 23:46:00 -04:00
Keith Packard f8dd80d13b Replace dixLookupResource by dixLookupResourceBy{Type,Class} 
dixLookupResource attempted to automatically detect whether the caller
wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
RT_NONE. Instead of trying to make the guess better, this patch just reverts
the unification and creates separate functions for each operation.
 2009-03-09 13:08:09 -07:00
Adam Jackson 132b464d73 Remove a bunch of useless casts. 
We've had void * for twenty years now people let's try to act like we
know how it works.
 2009-01-22 02:11:16 -05:00
Tomas Carnecky ebea78cdba Prepare for array-index based devPrivates. 
TODO: static indices can be made just an int; some indices
can be combined.
 2008-08-28 18:05:40 -04:00
Matthieu Herrb 95d162c438 CVE-2008-1377 - RECORD and Security extensions memory corruption 
Lack of validation of the parameters of the
SProcSecurityGenerateAuthorization SProcRecordCreateContext
functions makes it possible for a specially crafted request to trigger
the swapping of bytes outside the parameter of these requests, causing
memory corruption.
 2008-06-11 08:06:09 -06:00
Peter Hutterer 8190ef8754 Merge branch 'master' into mpx 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
 2008-04-22 18:04:05 +09:30
Adam Jackson eafaf40fb3 Death to APPGROUP. 2008-04-18 18:50:05 -04:00
Peter Hutterer fd06e8f8c1 Merge branch 'master' into dcdc_rework 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
 2008-04-07 07:56:41 +09:30
Peter Hutterer 4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
 2008-03-04 18:11:10 +10:30
Eamon Walsh cc76ea6e3a XACE: Add generic support for property and selection polyinstantiation. 2008-02-29 18:01:37 -05:00
Eamon Walsh c8e979b3b8 security: Register resource names in the server-side name registry. 2008-02-26 21:36:46 -05:00
Eamon Walsh f343265a28 XACE: Make the default window background state configurable per-window. 
To recap: the original XC-SECURITY extension disallowed background "None" if
the window was untrusted.  XACE 1.0 preserved this check as a hook function.
XACE pre-2.0 removed the hook and first abolished background "None entirely,
then restored it as a global on/off switch in response to Bug #13683.
Now it's back to being per-window, via a flag instead of a hook function.
 2008-02-20 15:59:40 -05:00
Eamon Walsh 4573cb2ce4 security: Revise set of permissions granted to untrusted clients. 
Bug #14480: untrusted access broken on 7.3.
 2008-02-13 20:20:49 -05:00
Eamon Walsh 5c30327275 XACE: Push the dix "structure" includes down to the security modules. 2008-02-05 21:06:05 -05:00
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
 2008-01-03 17:04:54 +10:30
Peter Hutterer e5dd7a9579 Xext: Scruffy the janitor don't like no "register" keywords. 2007-11-21 15:59:31 +10:30
Eamon Walsh 8583bf78ad registry: Remove registry code from XC-SECURITY extension. 
Moving all the names to dix/registry.c
 2007-11-20 18:21:09 -05:00
Eamon Walsh b092856bab registry: Register XC-SECURITY extension protocol names. 2007-11-09 14:45:02 -05:00
Eamon Walsh 8b5d21cc1d Rework of the XC-SECURITY extension. The gen-auth protocol has not changed, 
but the XC-QUERY-SECURITY-1 authorization method and the SecurityPolicy
configuration file have been removed.  The semantics of the trusted vs.
untrusted split have been changed.  This will be documented in a future
commit.
 2007-11-08 16:32:42 -05:00
Eamon Walsh 50551ec693 xace: remove obsoleted DRAWABLE_ACCESS hook. 2007-09-28 15:04:33 -04:00
Eamon Walsh b2b7817497 devPrivates rework: use camelcase standard for name of key type. 2007-08-16 15:33:58 -04:00
Eamon Walsh 5bee8db003 xace: drop background-none checking hook, add new hook for controlling 
access to other clients.
 2007-08-16 10:44:51 -04:00
Eamon Walsh 3c9553ac2c xace: rename hostlist security hook to "server" as this hook will be used 
for other types of server access besides just the host list.
 2007-08-15 14:14:25 -04:00
Peter Hutterer f367285fd5 Merge branch 'master' into mpx 
Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c
 2007-08-12 15:31:10 +09:30
Eamon Walsh 375864cb74 security: drop support for XC-QUERY-SECURITY authorization method. 2007-08-03 13:23:34 -04:00
Eamon Walsh d445d2f22b security: drop the "declare extension security" dix call. Use the 
SecurityPolicy configuration file instead.
 2007-08-03 10:56:18 -04:00
Eamon Walsh e34fcd2bf4 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
 2007-08-02 14:27:03 -04:00
Adam Jackson f7f3fe7fe7 Remove the remnants of OS/2 support. 
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
 2007-06-28 18:59:05 -04:00
Peter Hutterer 5c680e9493 Remove double-grab option. We only want one grab per device. 2007-05-14 12:34:53 +09:30
Eamon Walsh 9cee4ec5e6 xace: change the semantics of the return value of XACE hooks to allow 
arbitrary X status codes instead of just TRUE/FALSE.

The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however.  There is more error propagation
work to do.
 2007-04-17 16:01:56 -04:00
Eamon Walsh 47bd311e3d security: remove debugging code. 2007-04-17 13:46:55 -04:00
Eamon Walsh 1cb84768f3 security: rewrite to use new devPrivates support. 2007-04-03 15:31:16 -04:00
Peter Hutterer e8777a91f3 Merge branch 'master' into mpx 
Conflicts:

	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c
 2007-04-02 15:36:26 +09:30
Eamon Walsh 0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04:00
Adam Jackson 04b87d6dfa Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
Eamon Walsh 84a066cc88 xace: pass serverClient as default argument to dixChangeWindowProperty 
instead of NullClient.
 2007-03-23 10:33:53 -04:00
Eamon Walsh e1cc68add0 xace: drop the name argument from the property callback. 2007-03-22 17:33:16 -04:00
Eamon Walsh 1b766ffc06 dix: reorganize property code to better support xace hook; requires new API for 
changing a property, dixChangeWindowProperty, taking an additional client argument.
 2007-03-22 15:55:35 -04:00
Eamon Walsh 1b58304ac8 xace: add new argument to property hook for property structure itself. 2007-03-22 14:07:01 -04:00
Eamon Walsh 6a89106e9c xselinux + security: remove confusing CALLBACK macro. 2007-03-19 16:51:29 -04:00
Peter Hutterer ceca5670fe dix: Each device needs to differ between a core grab and an XI grab, 
otherwise a Xi grab may overwrite or release a core grab.
        Replace grab and associates with coreGrab and deviceGrab structures,
        adjust rest of dix/Xi/etc to compile.

xfree86: Don't check for core devices, we'll have the virtual ones anyway.
         If we check, the first mouse device is duplicated and sends
         double events.
 2007-03-08 17:17:23 +10:30
Peter Hutterer 1f0075786f Merge branch 'master' into mpx 
Conflicts:

	configure.ac
	dix/getevents.c
	hw/xfree86/ramdac/xf86Cursor.c
	mi/mipointer.c
	xkb/xkbUtils.c
 2007-03-05 12:37:17 +10:30
Eamon Walsh c2f3f705f1 Bug #6988: Change behavior of Security extension per user feature request. 2007-02-15 14:38:24 -05:00
Peter Hutterer 15a81b6325 Merge branch 'master' 2007-01-28 17:18:57 +10:30
Alan Coopersmith b32a40817f Correct variable descriptions in comment for SecurityCheckResourceIDAccess 2007-01-24 16:29:49 -08:00
Peter Hutterer 2d0a63126b Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver 2006-12-19 10:31:40 +10:30
Eamon Walsh 6c46645cfc Naming change: Security*Access -> Dix*Access 2006-12-14 14:45:42 -05:00
Peter Hutterer 3c8f166022 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx 
Conflicts:

	dix/events.c
 2006-12-05 18:28:33 +10:30
Eamon Walsh ac90ce58ba Naming change: Security*Operation -> Xace*Operation 2006-12-01 21:15:41 -05:00
Peter Hutterer 8c16f21d5d dix GetSpriteWindow() adjusted for MPX 
added device dependency for MPX to DoEnterLeaveEvents,
	EnterLeaveEvents, EnterNotifies, LeaveNotifies and
	FixUpEventFromWindow.
 2006-11-22 17:06:47 +10:30
Eamon Walsh 3d39c02fe6 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.
 2006-11-06 21:25:52 -05:00
Eamon Walsh 75fe0670eb whitespace adjust 2006-11-06 15:30:25 -05:00
Eamon Walsh 0539d9cf24 Bug #8875: Security extension causes Xorg to core dump on server reset 2006-11-06 15:29:17 -05:00
Eamon Walsh c93877100e Don't need to allocate memory now that devPrivates are being used. 2006-09-08 15:21:57 -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
Eamon Walsh 96e45626c4 Rebase Security extension to use devPrivates for storing security state. 2006-08-02 20:29:59 -04:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04: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
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
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
Daniel Stone a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Adam Jackson 7deaaa797c Big old pile of warning fixes. 2006-03-28 01:21:00 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. 
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
 2005-07-03 07:02:09 +00:00
Daniel Stone 9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone 292c4cff26 Fix includes right throughout the Xserver tree: 
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
 2005-04-20 12:25:48 +00:00
Egbert Eich 0664db19bf Merging XORG-CURRENT into trunk 2004-04-23 18:54:16 +00:00
Egbert Eich dae90c3af9 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2004-03-14 08:34:49 +00:00
Egbert Eich 867451f1ab Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2004-03-03 12:12:50 +00:00
Egbert Eich df0313d35b readding XFree86's cvs IDs 2004-02-26 13:36:15 +00:00
Egbert Eich 147aae87fd Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2004-02-26 09:23:53 +00:00
Kaleb Keithley 12e532010b XFree86 4.3.99.902 (RC 2) 2003-12-19 20:55:39 +00:00
Kaleb Keithley adc7f9a4eb XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 2003-11-25 19:29:01 +00:00
Kaleb Keithley d568221710 XFree86 4.3.0.1 2003-11-14 16:49:22 +00:00
Kaleb Keithley ded6147bfb R6.6 is the Xorg base-line 2003-11-14 15:54:54 +00:00