Commit Graph

5361 Commits

Author SHA1 Message Date
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
Eamon Walsh
eed6713d3d SELinux: Bring server-side name registry up to date.
(cherry picked from commit 656d3d7623)
2008-06-17 17:59:10 -04:00
Adam Jackson
7822a3d05f XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
a proper solution someday, but then, those bugs aren't closed yet either.
2008-06-17 16:10:51 -04:00
Michel Dänzer
d900de5a8f AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .

(cherry picked from commit 23b55a61f8)
2008-06-17 13:13:23 -04:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
2008-06-17 10:48:41 -04:00
Matthieu Herrb
d254903413 configure.ac: fix the help string for --with-freetype.
Default value was changed to 'no' in e5b1d38e14
but the help string wasn't updated.
2008-06-14 14:40:32 -06:00
Matthieu Herrb
c2877c073b Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch 2008-06-14 14:32:42 -06:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
2008-06-13 16:45:08 -04:00
Matthieu Herrb
a645b47f04 Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch 2008-06-12 14:22:32 -06:00
Dave Airlie
21248705bb modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
2008-06-12 14:54:56 +10:00
Julien Cristau
53a84d75c6 xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e)
2008-06-12 10:01:41 +10:00
George Sapountzis
336a46c519 glx: fix memory corruption with r5g6b5
should cherry-pick to xserver-1.5
(cherry picked from commit 6c72961d8f)
2008-06-12 09:27:00 +10:00
Dave Airlie
38f573566e dbe: fix DoS reported by iDefense.
This isn't a security problem just a user could DoS themselves for fun or profit.
(cherry picked from commit 23e71ef71a)
2008-06-12 09:04:47 +10:00
Peter Hutterer
59a52d8151 config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.

So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.

* rmlv ... rules, model, layout, variant

See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
(cherry picked from commit fc35d1e3be)
(cherry picked from commit ff013b0da4)
2008-06-11 11:27:01 -04:00
Peter Hutterer
82e7cf1245 config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
(cherry picked from commit 1f54c05cf8)
(cherry picked from commit 901978ebe0)
2008-06-11 11:27:01 -04:00
Sascha Hlusiak
b4c5832c75 Support to pass arbitrary options via HAL hotplugging
Parse "input.x11_options" and pass every key/name pair to the driver.
Remove check for input.capabilities, because that's part of the fdi files.

Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
(cherry picked from commit 47eb658e80)
2008-06-11 11:27:01 -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
Matthieu Herrb
69b173c699 CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.
(cherry picked from commit c5f69b297b)
2008-06-11 11:27:00 -04:00
Matthieu Herrb
b251fdd9d9 CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the ProcRenderCreateCursor() function which
will cause less memory to be allocated than expected, leading later to
dereferencing un-mapped memory, causing a crash of the X server.
(cherry picked from commit 5257a0f83d)
2008-06-11 11:27:00 -04:00
Matthieu Herrb
edd2cac9fa CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
(cherry picked from commit 9171206db3)
2008-06-11 11:27:00 -04:00
Matthieu Herrb
6de2855b88 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.
2008-06-10 12:31:11 -06:00
Matthieu Herrb
ebd916314d 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-10 12:30:54 -06:00
Matthieu Herrb
a1733327aa CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
2008-06-10 12:30:46 -06:00
Matthieu Herrb
5677751a04 CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the ProcRenderCreateCursor() function which
will cause less memory to be allocated than expected, leading later to
dereferencing un-mapped memory, causing a crash of the X server.
2008-06-10 12:30:31 -06:00
Matthieu Herrb
f7c40a003d CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.
2008-06-10 12:30:06 -06:00
Jeremy Huddleston
0ab483f74e XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00)
2008-06-10 10:51:49 -07:00
Jeremy Huddleston
be616f0f8f XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7)
2008-06-10 10:51:40 -07:00
Daniel Stone
8259d19f71 Xi: event_{x,y} should refer to the extended device (bug #16289)
ProcessOtherEvents was unconditionally stomping the root_{x,y}
co-ordinates provided by GetPointerEvents with those of the core
pointer, meaning that both root_{x,y} and event_{x,y} reported to
clients would reflect the sprite's position, not the position reported
by the device that generated the DeviceMotionNotify or the
DeviceButton{Press,Release} event in the first place.

For key events we still take the sprite's co-ords, as we're delivering
to the focus, which is the (VCP) sprite.

Not cherry-picked from master as MPX fixes this anyway, by taking the
co-ords of the sprite the device moves (be it visible or no).
2008-06-10 18:33:57 +03:00
Jeremy Huddleston
8e3a85beb9 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10)
2008-06-10 01:45:57 -07:00
Jeremy Huddleston
a58487db23 XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623fa)
2008-06-10 01:45:50 -07:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Julien Cristau
4e3cf7cd89 Add xkbstr.h and xkbsrv.h to sdk_HEADERS
(cherry picked from commit 150c2f55a5)
2008-06-09 17:31:10 -04:00
Adam Jackson
c7c43285b1 Merge branch 'server-1.5-branch' of git+ssh://git.freedesktop.org/git/xorg/xserver into server-1.5-branch 2008-06-09 17:06:41 -04:00
Michel Dänzer
facf271b05 EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a CreatePixmap hook.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
(cherry picked from commit 6b96281100)
2008-06-09 14:11:46 -04:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
2008-06-09 14:09:39 -04:00
Michel Dänzer
1667ed6e24 EXA: Don't migrate twice in exaImageGlyphBlt.
exaPrepareAccess already handles migration.
(cherry picked from commit f6d61d3d86)
2008-06-09 14:04:21 -04:00
Michel Dänzer
6dee3fdf18 EXA: Don't suggest exaCopyDirty be inlined.
Leave the decision to the compiler toolchain.
(cherry picked from commit d733043982)
2008-06-09 14:04:01 -04:00
Michel Dänzer
3943a3a567 EXA: Specify region used for source pixmap migration in exaCopyNtoN.
Avoids excessive migration overhead in some pathological cases. See
http://bugs.freedesktop.org/show_bug.cgi?id=15845 .
(cherry picked from commit 3baf3b42e0)
2008-06-09 14:03:36 -04:00
Drew Parsons
c00ff932f8 Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.

Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
(cherry picked from commit 2a3d1421e0)
2008-06-09 13:57:03 -04:00
Drew Parsons
2f994cb00e Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
(cherry picked from commit 966ae1781f)
2008-06-09 13:56:59 -04:00
Drew Parsons
30774d6b3c Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
(cherry picked from commit 571206832d)
2008-06-09 13:56:53 -04:00
Tilman Sauerbeck
200d676be2 EXA: Set pixmap->accel_blocked on the screen pixmap, too.
(cherry picked from commit 3f081b4de5)
2008-06-09 13:44:37 -04:00
Tilman Sauerbeck
2df83b491e EXA: Update sys_pitch/fb_pitch in exaModifyPixmapHeader.
exaModifyPixmapHeader now also only evaluates arguments that have a
meaningful value.
(cherry picked from commit 26c1801a27)
2008-06-09 13:44:32 -04:00
Michel Dänzer
0fba91a532 EXA: Offscreen memory eviction improvements.
* Make sure available areas are considered to have no eviction cost. This seems
  to help for https://bugs.freedesktop.org/show_bug.cgi?id=15513 but I'm afraid
  that may just be coincidence.
* Only calculate eviction cost of each area once for each eviction pass.
  Safeguard against potential (though unlikely) division by zero.
* Cosmetic enhancements: Name eviction cost related variables 'cost' instead of
  'score' to emphasize that smaller values are better, update Doxygen file
  comment to the way eviction works now.
(cherry picked from commit 6c95fae1e9)
2008-06-09 13:44:26 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux
(cherry picked from commit ea4ec9e998)
2008-06-09 13:29:32 -04:00
Aaron Plattner
77313bdc76 CreateColormap returns Success on success, not TRUE.
Fixes a problem where enabling color index overlays disables the RENDER
extension.
(cherry picked from commit 607b0d09ea)
2008-06-09 09:59:42 -07:00
Jeremy Huddleston
500ace5659 XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9)
2008-06-04 12:23:12 -07:00
Jeremy Huddleston
677c8d6af7 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cad)
2008-06-04 12:23:06 -07:00
Jeremy Huddleston
9e30e41c6e XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd)
2008-06-04 12:23:00 -07:00