Commit Graph

4213 Commits

Author SHA1 Message Date
Peter Hutterer
153c6d48c6 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).

Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
(cherry picked from commit bea743f3d629bafdc301f40e9c0bc11382dfe8bc)

Conflicts:

	hw/xfree86/common/xf86Config.c
	hw/xfree86/doc/man/xorg.conf.man.pre
2008-07-03 15:05:14 +09:30
Jeremy Huddleston
0733ef2e8a Set machine dependent defaults for ppc64 2008-07-02 00:47:08 -07:00
Peter Hutterer
9b62355847 xkb: reset xkb_cached_map on CloseDownDevices.
Could lead to some invalid pointers in the second server generation.
(cherry picked from commit ff3adf3e56)
2008-06-28 20:32:27 +09:30
Peter Hutterer
7cdef0d6fc xkb: delete default rules when devices are closed.
We only have one set of default rules options in xkb. When the second keyboard
is brought up with Xkb options specified, these new options overwrite the old.
In future server generations, the rules used for the VCK are a mixture of the
default ones and ones previously specified for other keyboards. Simply
resetting the xkb default rules to NULL avoids this issue.

Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
second server generation, the VCK has "us(nodeadkeys)". This again produces a
SIGABRT when the first key is hit.

I could not figure out why the SIGABRT happens. This patch is avoiding the
issue rather than fixing it.
(cherry picked from commit 5a3d06b8f4)
2008-06-28 20:31:57 +09:30
Peter Hutterer
5903b4c749 kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.
Backported from master to server-1.4.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
(cherry picked from commit 26e7e69ab8)
2008-06-28 20:31:39 +09:30
Jeremy Huddleston
f5e399e995 1.4.2-apple2 2008-06-25 11:51:56 -07:00
Jeremy Huddleston
49668e8a88 XQuartz: Set noPanoramixExtension earlier to avoid a possible race. 2008-06-25 11:51:27 -07:00
Jeremy Huddleston
e65a36d57f Xquartz: Removed include directive for removed header 2008-06-11 11:44:45 -07:00
Jeremy Huddleston
aac6869c53 1.4.2-apple1 2008-06-11 11:28:40 -07:00
Jeremy Huddleston
69605654ba Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-11 11:28:16 -07:00
Julien Cristau
c3a7903f6a Bump to 1.4.2
And update release date.
2008-06-11 16:27:40 +02:00
Jeremy Huddleston
871ebd95fc 1.4.1-apple1
Something slightly perfecter
2008-06-10 10:50:18 -07:00
Jeremy Huddleston
78e98f9cc4 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-10 10:49:06 -07:00
Jeremy Huddleston
a9ee6b0d00 XQuartz: Removed code path for old startup 2008-06-10 10:47:37 -07:00
Matthieu Herrb
08e6292e7e 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 11:43:43 -06:00
Matthieu Herrb
8ffaf61370 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 11:43:35 -06:00
Matthieu Herrb
702e709973 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 11:43:27 -06:00
Matthieu Herrb
c4937bbb69 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 11:42:35 -06:00
Matthieu Herrb
b1a4a96885 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.

On systems where the X  SIGSEGV handler includes a stack trace, more
malloc()-type functions are called, which may lead to other
exploitable issues.
2008-06-10 11:42:27 -06:00
Daniel Stone
43285b4f72 Bump to 1.4.1
Whatever.  It doesn't have to be perfect.
2008-06-10 18:36:38 +03:00
Daniel Stone
4d59afd613 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).
(cherry picked from commit 8259d19f71)
2008-06-10 18:34:18 +03:00
Jeremy Huddleston
4505bae5d7 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 2008-06-10 02:15:25 -07:00
Jeremy Huddleston
ee92aced10 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 2008-06-10 01:39:15 -07:00
Jeremy Huddleston
d8cf5623fa XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 2008-06-04 18:28:20 -07:00
Jeremy Huddleston
d3cd7b4ed2 1.4.0-apple14 2008-06-04 12:21:28 -07:00
Jeremy Huddleston
c407bae5b8 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-06-04 12:20:35 -07:00
Jeremy Huddleston
7812a8bdf9 XQuartz: Removed async debugging sleep 2008-06-04 12:19:28 -07:00
Jeremy Huddleston
ff1c443cad XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 2008-06-04 12:01:19 -07:00
Jeremy Huddleston
c3558bb8cd XQuartz: Don't forget to destroy the mutex and cond after we're done with them 2008-06-04 11:35:24 -07:00
Jeremy Huddleston
dd0f8a0f59 XQuartz: Fork for trigger 2008-06-04 11:18:52 -07:00
Jeremy Huddleston
7f840e9dc1 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/ 2008-06-03 00:06:26 -07:00
Sascha Hlusiak
7982aaa7f0 Fix getValuatorEvents to compute number of valuators correctly. 2008-05-30 19:38:49 +02:00
Jeremy Huddleston
87b027bb59 1.4.0-apple13 2008-05-23 02:28:13 -07:00
Jeremy Huddleston
2bb4251b3c XQuartz: A 2 second delay for launchd socket connections should be sufficient. 2008-05-23 02:27:58 -07:00
Jeremy Huddleston
83f7252939 XQuartz: Add the launchd fd to AllSockets as well 2008-05-23 02:10:14 -07:00
Jeremy Huddleston
36db2ace75 1.4.0-apple12 2008-05-23 01:42:51 -07:00
Jeremy Huddleston
1e1f4fb717 XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code. 2008-05-23 01:42:24 -07:00
Jeremy Huddleston
c3866c98d2 XQuartz: Move the launchd display grabbing into mach_startup 2008-05-23 01:39:02 -07:00
Jeremy Huddleston
7dd3512715 XQuartz: Fixed a few issues with fd passing... still not working =( 2008-05-19 03:13:09 -07:00
Jeremy Huddleston
cccee9cfc2 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 2008-05-19 02:45:47 -07:00
Jeremy Huddleston
2a72309c06 XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config 2008-05-18 23:51:06 -07:00
Jeremy Huddleston
6fb587d3d5 XQuartz: Cleaned up ListenOnOpenFD... 2008-05-18 23:31:41 -07:00
Jeremy Huddleston
c27e0c8f3c New XQuartz icon thanks to Simone Karin Lehmann 2008-05-18 23:02:12 -07:00
Jeremy Huddleston
632ea62166 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-17 14:55:57 -07:00
Jeremy Huddleston
301262b070 XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there... 2008-05-17 14:51:09 -07:00
Peter Hutterer
ddcca23a81 xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
(cherry picked from commit 0b0a097973)
2008-05-17 15:12:38 +02:00
Mart Raudsepp
4e5cf76eca xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
(cherry picked from commit ab9b0b36ac)
(cherry picked from commit 4fa89fbe18)
... and backported to 1.4 (back to no new devprivates and "amd" driver name)
2008-05-16 20:16:57 +03:00
Michel Dänzer
22b1a9dd0f EXA: Skip empty glyphs. (cherry picked from commit ce50bfd336) 2008-05-16 19:52:33 +03:00
Daniel Stone
2989f10716 Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.

This has probably been the case since backing store has been
implemented on top of Composite.

It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.

In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.

This addresses:

https://bugs.freedesktop.org/show_bug.cgi?id=15878
(cherry picked from commit 04211c3532)
2008-05-16 19:49:05 +03:00
Adam Jackson
33a9ee9ba0 Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-05-16 17:26:57 +03:00