summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-04-16security: Grant untrusted windows remove access on all windows.server-1.5-branchEamon Walsh1-0/+5
This allows untrusted clients to destroy their own windows when they have been reparented by a trusted window manager. (cherry picked from commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545)
2009-04-16security: Fix a crash caused by wrong ordering of format arguments.Eamon Walsh1-3/+4
(cherry picked from commit 3481b32ab971c41cb972f6819ae049f3e9f7033b)
2009-04-16security: Revert behavior of extension access for compatibility.Eamon Walsh1-14/+16
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 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for some reason. Return to the old, compatible behavior. (cherry picked from commit 6045506be0cebca4ebbe943ae77f020aafa703d4)
2008-12-16xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.Peter Hutterer1-4/+15
(cherry picked from commit 95fc59a199f99bf167fbb09297a9bb0e33e31869)
2008-12-16EXA: avoid copy operations if no boxes in useDave Airlie1-0/+4
Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0. (cherry picked from commit 8f8a9c19ad58768b07461a3f4bccea98f7c4f958)
2008-12-16Non-Linux OS'es should default to kbd driver, not now-dead keyboard driverAlan Coopersmith1-2/+2
(cherry picked from commit d63ea510138c8b6de66184c78cda39ed9981fc1f)
2008-12-16Use OsSignal in Popen/Pclose to avoid SysV signal() stupidityAlan Coopersmith1-4/+4
(cherry picked from commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8)
2008-12-16XAA PixmapOps: Sync before accessing unwrapped callbacks.Luc Verhaegen3-3/+9
When using any XAAPixmapOps, we call into unknown but freshly unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls, we did so without syncing first, exposing us to all kinds of synchronisation issues. I believe that the rendering errors appeared now because *PaintWindow vanished (e4d11e58), and we just use miPaintWindow instead. This takes a less direct route to the hw and ends up at PolyFillRectPixmap, which very often left drawing artifacts. We now sync accordingly, and no longer get the rendering artifacts i was methodically reproducing on radeonhd, radeon, unichrome... Also, in order to allow driver authors to remove extensive syncing or flushing to hide this issue, create XAA_VERSION_ defines, put them in xaa.h and bump the patchlevel. (novell bug #435791) (cherry picked from commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e)
2008-12-16xfree86: xf86SetDepthBpp needs to respect the driver's depth24flagsJulien Cristau1-5/+0
When setting the depth to 24, leave bpp unset so the logic to pick a supported value is used instead of ignoring the driver's preference and forcing 32 bpp. (cherry picked from commit 991c88b7542164194be73573e7644164416ea90c)
2008-12-16mi: Fix infinite loop on regen when swrast_dri.so is missingJulien Cristau1-1/+2
The swrast DRI provider gets pushed on the glx provider stack at every server generation, so the stack turns into a circular list on regen. X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388> (cherry picked from commit d3d6be4948fa19947fd3b03e6694247109cc0ffb)
2008-12-16int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.Egbert Eich1-2/+10
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute code in memory that is not marked EXEC. Such code gets called whenever we return from a VBIOS call to signal the calling program that the call is actually finished and that we are not trapping for other reasons (like IO accesses). Use mprotect(2) to set these memory ranges PROT_EXEC. (cherry picked from commit a9e20306fbe3262602f21b876a52a1ef38cdf20a)
2008-11-05xserver 1.5.3xorg-server-1.5.3Adam Jackson1-2/+3
2008-11-05xfree86: fix compiler warnings in DoModalias()Julien Cristau1-3/+3
The precedence of == is higher than that of &, so that code was probably buggy. xf86Init.c: In function 'DoModalias': xf86Init.c:300: warning: suggest parentheses around comparison in operand of & xf86Init.c:304: warning: suggest parentheses around comparison in operand of & xf86Init.c:308: warning: suggest parentheses around comparison in operand of & (cherry picked from commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0)
2008-11-05Xorg: add -modalias optionNathaniel McCallum4-135/+228
This scans the installed video drivers and prints a Linux-style modalias listing of the devices each driver claims to support.
2008-11-05AIGLX: Reinstate call to driver texOffsetFinish hook.Michel Dänzer1-0/+2
It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this is a regression fix and should probably be backported to server-1.5-branch. (cherry picked from commit a4d62bbf215894bad8e19d99f7330c637d3d49e3)
2008-11-05linux: Drain the console fd of data when using evdev for keyboardsAdam Jackson1-0/+17
Works around a silly bug in the kernel that causes wakeup storms after too many keypresses. Should fix the kernel bug too, but this at least keeps the idle wakeup count below 1000/sec. (cherry picked from commit 446d9443cea31e493d05c939d0128a8116788468)
2008-11-05xfree86: If AEI is on, disable "kbd" and "mouse" devices.Peter Hutterer2-2/+38
This consists of two parts: In the implicit server layout, ignore those drivers when looking for a core device. And after finishing the server layout, run through the list of devices and remove any that use mouse or kbd. AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> (cherry picked from commit c264826da96ad1859dd112b17eb8aa9e5278478f)
2008-11-05xfree86: if AllowEmptyInput is true, enable RAW mode on the console.Peter Hutterer1-1/+34
Usually, the console is set to RAW in the kbd driver. If we hotplug all input devices (i.e. the evdev driver for keyboards) and the console is left as-is. As a result, the evdev driver must put an EVIOCGRAB on the device to avoid characters leaking onto the console. This again breaks many things, amongst them lirc, in-kernel mouse button emulation and HAL. This patch sets the console to RAW if AllowEmptyInput is on. Use-cases: 1. AEI is off 1.1. Only kbd driver is used - behaviour as-is. 1.2. kbd and evdev driver is used: if evdev does not grab the device, duplicate events are generated. 2. AEI is on 2.1. Only evdev driver is used - behaviour as-is, but evdev does not need to grab the device anymore. 2.2. evdev and kbd are used: duplicate key events are generated if evdev does not grab the device. 1.2 is a marginal use-case that can be fixed by adding a "grab" option to the evdev driver (update of xorg.conf is needed). 2.2 is an issue. If we have no ServerLayout section, AEI is on, but devices specified in the xorg.conf are still added [1], resulting in duplicate events. This is a common configuration and needs sorting out. [1] 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit d936a4235c9625bd41569cef3452dd086284e0d7)
2008-11-05config: don't add duplicate devices through HAL.Peter Hutterer1-0/+27
If HAL is restarted, the device list is sent to the server again, leading first to duplicate devices (and thus duplicate events), and later to a FatalError "Too many input devices." dev->config_info contains the UDI for the device. If the UDI of a new devices is equal to one we already have in the device list, just ignore it. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> (cherry picked from commit 6c451859552e1fc78f6589617482f9ff96d7ed8a)
2008-11-05Close well known connections in ServerAbort()Matthieu Herrb1-0/+1
(cherry picked from commit d72cd753b99fae147ef4c189700fc697f1ea7fb0)
2008-11-05exa: Add exaDrawableIsOffscreen() to the driver API.Adam Jackson2-3/+4
(cherry picked from commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003)
2008-11-05EXA: Avoid excessive syncing in PutImageMichel Dänzer1-2/+4
(cherry picked from commit 2188582e5ea90edb432a2f421d0a267439ba08f9)
2008-11-05RANDR: Fix output property event delivery.Pierre Willenbrock1-0/+6
(cherry picked from commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f)
2008-11-05RANDR: Delivery output property events.Keith Packard1-6/+32
(cherry picked from commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491)
2008-11-05Force LC_ALL=C when building xf86DefModeSet.cRémi Cardona1-1/+2
Fixes build in not-quite-latin locales.
2008-11-05Bug #17858: Fix Xvesa build on newer kernels.Martin von Gagern1-0/+7
Not cherry picked from master, Xvesa is gone there.
2008-10-27dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.Maarten Maathuis1-2/+0
- This breaks on the 2nd server generation. - No other subsystem seems to NULL their key. - This should fix bug 17982. (cherry picked from commit 5b336585a4cdf11d20831a9536ad581e959ea7f1)
2008-10-27Bug #18159: Spell "anisotropic" correctlyAdam Jackson1-1/+1
(cherry picked from commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202)
2008-10-27kdrive: Hardcode a different wrong value for number of mouse buttonsAdam Jackson1-1/+1
This should really come from the input driver directly, but, kdrive. (cherry picked from commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b)
2008-10-27Add backtrace definitions to dix-config.h.inAdam Jackson1-0/+6
(cherry picked from commit ad677238bc96a8578113bbe76d605d7a87aca44c)
2008-10-27mieq: Backtrace when the queue overflows.Adam Jackson1-0/+6
Since we're probably stuck down in a driver somewhere, let's at least try to point out where. This will need to be rethought when the input thread work lands though. (cherry picked from commit b736f477f5324f79af30fc0f941ba0714a34ccda)
2008-10-27Move xorg_backtrace() up to the OS level so we can call it from DIX.Adam Jackson4-173/+204
(cherry picked from commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd)
2008-10-27EDID: Catch even more cases of encoding aspect as size.Adam Jackson1-3/+7
Very cute, Samsung, not only do you claim to be 16cm by 9cm in the global size record, you also claim to be 160mm by 90mm in the detailed timings. Grrr. (cherry picked from commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a)
2008-10-10xserver 1.5.2xorg-server-1.5.2Adam Jackson1-2/+2
2008-10-10EDID: Catch monitors that encode aspect ratio for physical size.Adam Jackson1-0/+41
This is not legal in either EDID 1.3 or 1.4, but hey, when did a little thing like legality stop anyone. (cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)
2008-10-09Revert "Array-index based devPrivates implementation."Adam Jackson2-109/+102
This reverts commit 8ef37c194fa08d3911095299413a42a01162b078.
2008-10-08Fix GKVE with key_code > 255Julien Cristau1-3/+3
Move the keycode validation checks before use.
2008-10-08DGA: Fix ProcXF86DGASetViewPort for missing support in driver.Luc Verhaegen1-2/+5
Fixes a segfault when trying to activate a DGA mode without checking whether DGA modesetting is at all possible. (cherry picked from commit 1feb69eb63e6739ff5db255ad529e84adf941a10)
2008-10-08Check nextEnabledOutput()'s return in bestModeForAspect()Zhenyu Wang1-1/+2
In case no enabled outputs, we will reference wrong index of output array. (cherry picked from commit 56c615368c5a8e7acb0398434c2c68578626aa38)
2008-10-08int10: Fix a nasty memory leak.Adam Jackson1-0/+2
(cherry picked from commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6)
2008-10-08int10: Don't warn when scanning for devices we don't have.Adam Jackson1-7/+1
Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking for the config space of every possible device number. This despite perfectly functional BIOS methods to enumerate the bus exactly. (cherry picked from commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9)
2008-10-08int10: Remove useless check.Adam Jackson1-7/+0
If you have more than one PCI device with the same d/b/d/f, you're already in trouble. (cherry picked from commit a65e36a873cd1ba9896cd0f9a3e94dd933666005)
2008-10-08Array-index based devPrivates implementation.Eamon Walsh2-102/+109
Note: DevPrivateKey is now pointer-to-int, which means each key now needs to point to some global storage of size at least sizeof(int). (cherry picked from commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7)
2008-10-08xkb: squash canonical types into explicit ones on core reconstruction.Peter Hutterer1-3/+10
If we update key types from core, and groups 2 - n have a canonical type but the same symbols as the explicit type of group 1, assume that it was a core sym duplication according to Section 12.4 of the XKB Protocol Spec. Ignore the canonical types and pretend there's only one group for the key - with the explicit key type. The protocol spec does not cover this case, so we have to guess here. (cherry picked from commit 30c3c13f1030268aaa6a3598d538fafd0592d77a)
2008-10-08xkb: fix core keyboard map generation. #14373Peter Hutterer1-5/+34
According to Section 12.4 of the XKB Protocol Spec, if a key only has a single group but the keyboard has multiple groups defined, the core description of the key is a duplication of the single group across all symbols. i.e. G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4 The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to "invented" groups when the process is reversed. Note that this creates wrong key types on reconstruction from core to xkb, i.e. any single-group key with a key type that is not one of the canonical four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type for the other gruops. X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373> (cherry picked from commit ae986d1c73d2f720bd0309d8c33328d14e8eed25)
2008-10-08xkb: fix use of uninitialized variable.Kim Woelders1-12/+5
And some cosmetic changes to use stuff->change consistently. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> (cherry picked from commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab)
2008-10-06Remove usage of mfbChangeWindowAttributes missed in e4d11e58c...Alan Coopersmith1-1/+0
2008-09-24only build dri2 when DRI2 is enabledAlan Hourihane1-1/+5
2008-09-23xserver 1.5.1xorg-server-1.5.1Adam Jackson1-2/+2
2008-09-23Move RELEASE_DATE below AC_INIT.Adam Jackson1-1/+1
Doing it the other way around clobbers the setting, which means you get a null release date string in the log. Thanks autoconf!