Commit graph

394 commits

Author SHA1 Message Date
Jerome Glisse
b03f9fa630 Xext: fix a typo for bigreqsproto.h header file
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
(cherry picked from commit 0e46066efe)
2009-09-01 09:29:24 -07:00
Jeremy Huddleston
545161ea9e Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
bigreqsproto >= 1.1.0
xcmiscproto >= 1.2.0
xf86bigfontproto >= 1.2.0
2009-08-31 18:09:52 -07:00
Jeremy Huddleston
5ae71e9c94 Use evieproto.h instead... 2009-08-31 11:23:20 -07:00
Peter Hutterer
c40d988b23 Xext: include securproto.h instead of securstr.h
Reported-by: Byeong-ryeol Kim
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 4db8950b1d)
2009-08-31 11:21:54 -07:00
Jeremy Huddleston
fc792024f7 xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit a38ca0063c)
2009-08-31 11:20:00 -07:00
Peter Hutterer
f134395a82 Xext: fix up wrong conditions for negative sync transitions.
If the counter had a value higher than the trigger value for a negative
transition, the trigger value did not get set.

The correct sequence of checks is:
if (positive transition)
   if (counter value < trigger value)
      set up trigger
if (negative transition)
   if (counter value > trigger value)
      set up trigger

Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit db568f9eab)
2009-08-25 20:51:36 -07:00
Jeremy Huddleston
0a9f57c499 Update to xextproto 7.0.99.1.
xextproto had Xlib client headers moved into libXext.
Protocol header files are named fooproto.h, header files with constants
foo.h or fooconst.h where foo.h was already in use for client-side headers.
(cherry picked from commit d3f6b43a24)
2009-08-24 12:36:23 -07:00
Adam Jackson
2f08077533 xsync: Use a local header for server API definitions
(cherry picked from commit e0d8f6a808)
2009-08-24 12:36:23 -07:00
Jeremy Huddleston
0570adfe05 Sync is built-in and mandatory.
(cherry picked from commit f3ff238601)
2009-08-24 12:36:23 -07:00
Jeremy Huddleston
79ae3d47ed XC-MISC is built-in and mandatory.
(cherry picked from commit 3fcf4d3eb8)
2009-08-24 12:36:23 -07:00
Jeremy Huddleston
2b145ba81d Bigreqs are built-in and mandatory.
(cherry picked from commit f65c50c4e9)
2009-08-24 12:36:23 -07:00
Jeremy Huddleston
2fe86459cf Drop the FONTCACHE extension.
This appears to have been dead code since X-TT was merged.
(cherry picked from commit 0b45ba488d)
2009-08-24 12:36:23 -07:00
Eamon Walsh
7e4572a571 Fix "warning: no previous prototype for ‘XevieExtensionInit’".
(cherry picked from commit 720e44f973)
2009-08-24 12:36:23 -07:00
Jeremy Huddleston
6b37231bc5 Death to TOG-CUP.
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
(cherry picked from commit a7503615a6)
2009-08-24 12:36:22 -07:00
Eric Anholt
0769b0d400 Nuke the MIT-SUNDRY-NONSTANDARD extension.
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
(cherry picked from commit 25827fde68)
2009-08-24 12:36:21 -07:00
Adam Jackson
95cfb2ce88 Death to Extended Visual Information.
(cherry picked from commit f6617b4127)
2009-08-24 12:36:21 -07:00
Jeremy Huddleston
ac67b4fcf6 Merge commit 'origin/server-1.5-branch' into xorg-server-1.5-apple 2009-04-22 19:29:29 -07:00
Eamon Walsh
e1edd9e668 security: Grant untrusted windows remove access on all windows.
This allows untrusted clients to destroy their own windows when they
have been reparented by a trusted window manager.
(cherry picked from commit 4559d2ace6)
2009-04-16 23:50:13 -04:00
Eamon Walsh
a26ae2c63d security: Fix a crash caused by wrong ordering of format arguments.
(cherry picked from commit 3481b32ab9)
2009-04-16 23:50:05 -04:00
Eamon Walsh
62aa06d499 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.
(cherry picked from commit 6045506be0)
2009-04-16 23:49:58 -04:00
Jeremy Huddleston
159e6a1b20 X n'est pas une print API.
(cherry picked from commit 1c8bd318fb)
2009-02-24 22:26:32 -08:00
Adam Jackson
e8a45d97d3 Death to APPGROUP.
(cherry picked from commit eafaf40fb3)
2009-02-24 22:24:03 -08:00
Jeremy Huddleston
b030eb0ce6 Xevie: Shutup gcc from warning about no previous prototype... 2008-11-22 14:39:37 -08:00
Peter Harris
dba26368e5 Fix panoramiX request and reply swapping
Fix panoramiX request and reply swapping
 Set window and screen values in panoramix replies
 Prevent buffer overrun in ProcPanoramiXGetScreenSize
(cherry picked from commit 2b266eda6e)
2008-09-23 10:36:20 -04:00
Julien Cristau
9bb4990c91 Xevie: swap replies as necessary
(cherry picked from commit b5cdcfa55c)
2008-09-03 13:05:45 -04:00
Thorvald Natvig
bcea1095da Xevie: always initialize rep.length (bug#17394)
The XEvIE extension doesn't clear the rep.length field for any reply but
the version check. Hence, if there is junk data in it and that is sent
to the client, it hangs.

X.Org bug#17394 (http://bugs.freedesktop.org/show_bug.cgi?id=17394)
(cherry picked from commit d3ae193f4a)
2008-09-03 13:05:44 -04:00
Adam Jackson
4652c51e92 Reimplement ShmPutImage.
There's no reason to not just dispatch this straight into the GC.  As a
bonus, if you do so, damage wraps correctly, and thus swcursor works.
The side effect is it's no longer possible to override ShmPutImage with
ShmRegisterFuncs().

Also remove the (broken) damage tracking for same from EXA, since it didn't
work right, and is now superfluous.

(cherry picked from commit ee7c684f21)
2008-08-29 14:36:43 -04:00
Eamon Walsh
ef0780b738 Attempt getpeercon() on remote sockets as well as local ones.
(cherry picked from commit 60ad8d5d05)
2008-08-28 23:50:20 -04:00
Eamon Walsh
ad10515b6c SELinux: Add an extension alias under the OS-agnostic "Flask" name.
(cherry picked from commit 79dd600942)
2008-06-17 19:12:43 -04:00
Matthieu Herrb
626ea1b02d 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.
(cherry picked from commit 95d162c438)
2008-06-11 11:27:00 -04:00
Matthieu Herrb
e83c79701f CVE-2008-1379 - MIT-SHM arbitrary memory read
An integer overflow in the validation of the parameters of the
ShmPutImage() request makes it possible to trigger the copy of
arbitrary server memory to a pixmap that can subsequently be read by
the client, to read arbitrary parts of the X server memory space.
(cherry picked from commit 063f18ef6d)
2008-06-11 11:27:00 -04:00
Aaron Plattner
b69c74d14b Short-circuit PanoramiXTranslateVisualID after verifying that the visual actually exists first.
This allows using PanoramiXTranslateVisualID to test whether a given visual made
it through PanoramiXVisualConsolidate.
(cherry picked from commit 8b3d26f5b6)
2008-05-20 14:11:37 -07:00
Aaron Plattner
8afd1d62f6 Bug #14692: Allow drivers to have a say in Xinerama visual consolidation.
Create a new exported global variable, XineramaVisualsEqualPtr.  Use this
pointer to decide whether two visuals are equal during visual consolidation.
This pointer can be wrapped, which allows drivers and extensions to control
which visuals are consolidated.  A wrapper can reject the visuals without
calling down, but must call down and return that result if it deems the visuals
equal.  This ensures that all layers agree that the visuals are equal.

Pass the screen of the other visual into the VisualsEqual callchain.

Don't free PanoramiXVisuals since we need it for PanoramiXTranslateVisualID.

Don't skip the first visual on the other screen in PanoramiXMaybeAddVisual.

Skip the loop in PanoramiXTranslateVisualID if screen is 0.
(cherry picked from commit c50b5d9789)
2008-05-12 16:43:50 -07:00
Michel Dänzer
0327322708 Fix off-by-one error in ProcXResQueryClients().
Fixes memory corruption reported at
http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
(cherry picked from commit 0d1746995d)
2008-04-09 15:34:16 +02:00
Eamon Walsh
bde2890148 XSELinux: Add a request to get a client's context from a resource ID.
(cherry picked from commit 9f56fc5806)
2008-03-31 19:22:53 -04:00
Eamon Walsh
c26bccf417 XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
(cherry picked from commit b5f98fcea2)
2008-03-28 14:24:06 -04:00
Adam Jackson
fdf927c2cd Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-03-24 12:24:38 -04:00
Alan Coopersmith
a65e9722c4 Make Xevie private symbol names less generic
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
(cherry picked from commit 060a99444e)
2008-03-24 10:20:03 -04:00
Alan Coopersmith
0aa3b971b4 Xevie cleanups, byteswapping fixes & request length check fixes
(cherry picked from commit f37046984d)
2008-03-24 10:19:39 -04:00
Eamon Walsh
98249dfa98 XSELinux: Do a check for whether background "None" is allowed.
(cherry picked from commit 3bbd77ff98)
2008-03-20 21:34:42 -04:00
Eamon Walsh
d08bb7040c XSELinux: Correctly handle some permission bits that are used more than once.
(cherry picked from commit e323bb426c)
2008-03-20 21:34:31 -04:00
Eamon Walsh
9de621afee xselinux: Implement polyinstantiation support and related protocol.
(cherry picked from commit d4101140f4)
2008-03-04 22:42:53 -05:00
Eamon Walsh
cc76ea6e3a XACE: Add generic support for property and selection polyinstantiation. 2008-02-29 18:01:37 -05:00
Eamon Walsh
34bf308a9e dix: Refactoring of selection code to allow for polyinstantiation.
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
Eamon Walsh
d04ea267a4 xselinux: Don't require device "read" permission for XQueryPointer.
These keyboard and pointer state polling calls are a real problem.
2008-02-28 21:53:16 -05:00
Eamon Walsh
3fb17a3e64 xselinux: Log messages to both libaudit and Xorg.0.log. 2008-02-28 21:52:57 -05:00
Eamon Walsh
27bcf40cda XACE: Fix instances of DixUnknownAccess at hook callsites. 2008-02-28 16:43:43 -05:00
Eamon Walsh
f616735f17 xselinux: Prefix a few remaining error messages with "SELinux". 2008-02-27 22:48:29 -05:00
Eamon Walsh
e40cc5305b xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook.
The avc will still appear, however, so that the callsite can be fixed.
2008-02-27 22:48:28 -05:00
Eamon Walsh
3f0681fb0b xselinux: Stub out selection protocol requests. 2008-02-26 23:14:29 -05:00