Commit Graph

242 Commits

Author SHA1 Message Date
matthieu
2e211b412b CVE-2008-1379 - MIT-SHM arbitrary memory read.
(This patch was missing form the bunch of security patches committed
on june 11. noticed by brad@).
2008-06-17 21:53:45 +00:00
matthieu
0a77d3ef3e Add a man page for Xephyr, with information from the README file. 2008-06-15 16:20:07 +00:00
matthieu
97eda17882 Update to xserver 1.4.2. Tested by landry@, ckuethe@, jsing@ mbalmer@. 2008-06-15 00:17:32 +00:00
mbalmer
c0e3e5ed7f Add amdmsr(4) to the list of privsep devices.
ok matthieu
2008-06-14 21:37:13 +00:00
oga
4b526e486b change /dev/dri/card0 to /dev/drm0. Subdirs in /dev considered
irritating.
2008-06-12 22:20:24 +00:00
oga
bfd8533a7d Deal with devices that need to be opened differently to what we do in
privsep ( O_NONBLOCK | O_RDWR | O_EXCL) by turning the list of allowed
devices into a struct, with the flags we're supposed to use, then using
these values with open(). Add /dev/dri/card0 there too (more'll be needed to be
added when it matters).

This gives privsep with dri a chance to work.

ok matthieu
2008-06-12 18:50:19 +00:00
matthieu
5f1431f613 Fix from X.Org for a possible, non-exploitable crash in the DBE extension.
Reported to iDefense by regenrecht. Patch from Dave Airlie.
2008-06-11 16:15:28 +00:00
matthieu
52218799b8 Fixes for various integer overflow problems from X.Org:
CVE-2008-2360 - RENDER Extension heap buffer overflow
CVE-2008-2361 - RENDER Extension crash
CVE-2008-2362 - RENDER Extension memory corruption
CVE-2008-1379 - MIT-SHM arbitrary memory read
CVE-2008-1377 - RECORD and Security extensions memory corruption
2008-06-11 15:39:26 +00:00
mbalmer
ef9d4b4b8c Pull in a patch from X.Org-current to let X11 run on AMD Geode LX
CPUs in basic VESA mode:

X86EMU: handle CPUID instruction

Starting X on an AMD Geode LX system such as an Alix board with VGA
connector, the Xorg driver attempts to issue INT 10/0 to go to mode
3 (VGA).  The emulator, running the BIOS code, would then spit out:

	c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!

The opcode was 0F A2, or CPUID; it was not implemented in the
emulator. With this patch it handles the CPUID instruction in one of
two ways:

1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
   directly.

2) if ran elsewhere it returns a canned 486dx4 set of values for function 1.

Tested with & ok matthieu
2008-06-10 22:31:30 +00:00
phessler
f80be2c38a Remove the special case for amd64 using MTRR. Wasn't compiled in in the
first place, and didn't work anyways.

ok deraadt, oga, matthieu
2008-06-09 22:55:10 +00:00
matthieu
48bc822959 regen. 2008-05-24 20:39:01 +00:00
matthieu
1b5891c504 implement the --disable-ioport configure option to disable the build of
ioport and its symlinks and use that option. Requested by kettenis@
and others.
2008-05-24 20:36:04 +00:00
ajacoutot
790fc260ee - fix an infinite loop by ensuring that realInputProc is never
overwritten with the enqueueInputProc (from upstream git)
cf. https://bugs.freedesktop.org/show_bug.cgi?id=13511

This should fix hangs people were seeing with icewm, cwm and most
probably other WM under some circumstances.

ok matthieu@
2008-05-07 06:07:09 +00:00
matthieu
67dcbeb5eb If privsep support isn't compiled in, use open() to open the agp device. 2008-04-01 21:08:01 +00:00
matthieu
bbc31bf586 Introduce bsd.xconf.mk to set default config variables used
at several places in the Xenocara build in a central place instead
of duplicating the checks all over the place. ok oga@.
2008-03-25 23:41:50 +00:00
matthieu
d00d2dd896 msg_controllen has to be CMSG_SPACE so that the kernel can account for
each cmsg_len (ie. msg_controllen = sum of CMSG_ALIGN(cmsg_len).  This
works now that kernel fd passing has been fixed to accept a bit of
sloppiness because of this ABI repair.
lots of discussion with kettenis. From deraadt@
2008-03-24 21:24:52 +00:00
matthieu
7830df18ed Regen with autoconf 2.59-p2, with AM_SANITY check zapped. 2008-03-15 18:08:24 +00:00
matthieu
16236de311 Repair msg_controllen. In those cases it should just be
CMSG_SIZE(sizeof(int)), not sizeof(buffer) which may be larger because
of alignment. Based on fixes in base system.
2008-03-15 17:14:11 +00:00
matthieu
f0623845fe Correct CMSG_SPACE and CMSG_LEN usage, same fixes as in the base system.
ok deraadt@
2008-03-13 06:53:06 +00:00
matthieu
682a69ebb7 Fix from X.Org repository:
xkb: don't update LEDs if they don't exist (which would trigger an NULL
pointer dereference).
2008-02-20 21:32:39 +00:00
matthieu
807e8fa566 Fix from X.Org repository: untrusted access broken in 7.3. 2008-02-20 21:29:42 +00:00
matthieu
2610b1cdea Fix for CVE-2007-3069 from X.Org git repository:
Don't break grab and focus state for a window when redirecting it.

    Composite uses an unmap/map cycle to trigger backing pixmap allocation
    and cliprect recomputation when a window is redirected or unredirected.
    To avoid protocol visible side effects, map and unmap events are
    disabled temporarily.  However, when a window is unmapped it is also
    removed from grabs and loses focus, but these state changes are not
    disabled.

    This change supresses the unmap side effects during the composite
    unmap/map cycle and fixes a bug where a compositing window manager
     would cause the screensaver to lose its grab when it unredirects the
    fullscreen lock window.
2008-02-20 21:25:15 +00:00
miod
7d9176c215 endianness definitions for m88k, ok matthieu@ 2008-02-20 17:47:56 +00:00
miod
5fb9099459 Don't #define DEBUG anymore 2008-02-16 21:40:44 +00:00
miod
a1df61e9c2 Remove unused global. 2008-02-16 21:40:29 +00:00
miod
b019a50e70 Disable mesa on m68k, at least until it switches to ELF; suggested by matthieu@ 2008-02-13 21:34:15 +00:00
miod
af5d7dc88a Correctly link ioperm_noop.c to the build on m68k. ok matthieu@ 2008-02-13 21:33:29 +00:00
miod
d00b6d3f21 Remove a unused static function which references a function which had been
removed in the 1.4 update, it prevents wsfb from working on platforms without
lazy binding.
2008-02-13 21:29:52 +00:00
matthieu
4bd8c8049d Remove a bunch of files that get generated during a normal build. 2008-02-11 23:05:25 +00:00
matthieu
daec730aa0 Remove empty unused files. 2008-02-11 22:59:20 +00:00
matthieu
d33aacaadc Make it possible to build dri support with XENOCARA_BUILD_DRI=yes in
/etc/mk.conf. ok oga@
2008-02-02 17:19:57 +00:00
matthieu
3d74c14585 regen 2008-01-27 15:49:14 +00:00
matthieu
37eae9b7cf Fix m68k builds. Similar to the fix that miod used. 2008-01-27 14:03:40 +00:00
matthieu
192dfccc63 3rd try... CVE-2007-6429: Always test for size+offset wrapping. From X.Org. 2008-01-21 21:38:22 +00:00
matthieu
68a7d32fea Previous shm fix for CVE-2007-6429 was incorrect.
Don't spuriously reject <8bpp shm pixmaps. From X.Org repository.
2008-01-18 20:53:51 +00:00
matthieu
4ca84ce6c5 Fix from X.Org for CVE-2008-0006 - PCF Font parser buffer overflow. 2008-01-17 15:44:49 +00:00
matthieu
5215f23408 Fix from X.Org for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows. 2008-01-17 15:43:43 +00:00
matthieu
af2f977c6b Fix from X.Org for CVE-2007-6428 - TOG-cup extension memory corruption. 2008-01-17 15:43:06 +00:00
matthieu
868ab3f2e3 Fix from X.Org for CVE-2007-6427 - Xinput extension memory corruption. 2008-01-17 15:42:19 +00:00
matthieu
19e04f544a Fix from X.Org for CVE-2007-5958 - File existence disclosure. 2008-01-17 15:41:53 +00:00
matthieu
478587a2d7 Fix from X.Org for CVE-2007-5760 - XFree86 Misc extension out of
bounds array index.
2008-01-17 15:41:18 +00:00
matthieu
dc769e8a75 Based on a suggestion and an initial patch by kettenis@, build
both the old i810 and the new intel drivers on i386, and let X
autoconfiguration code choose the one that is used based on the chipset.
Tested by landry@ and a few others.
2008-01-16 23:20:50 +00:00
jsing
6189593aff regen 2008-01-04 14:01:04 +00:00
jsing
458c03da50 Add support for xserver on OpenBSD/sgi and enable build.
ok matthieu@
2008-01-04 13:44:23 +00:00
todd
6ff94f4734 more gcc2 fixes; ok mathieu@ 2008-01-01 23:31:01 +00:00
todd
fefd79e203 fix for gcc2 (declaration 1st within each scope)
ok matthieu@
2007-12-29 03:09:26 +00:00
matthieu
067fedef2d Adapt OpenBSD/wscons kdrive drivers to changes in xserver 1.4.
Still not working but at least building again.
2007-12-23 14:28:10 +00:00
matthieu
d99925b594 Make that build with gcc 2.95 2007-12-23 08:01:09 +00:00
matthieu
460b683f36 Don't call xcalloc() in functions called by the big SIGIO handler.
Problem initially reported by sthen@, fix tested by many.
2007-12-21 06:42:23 +00:00
matthieu
eb2e8d8cbc Fix build with gcc 2.95. ok todd@. 2007-12-20 07:26:37 +00:00
matthieu
67952fe293 Add back files that I removed before import to minimize cvs noise. That
was a mistake. sorry.
2007-12-13 21:51:47 +00:00
matthieu
b29102d7af Merge xserver 1.4.0.90. This includes fixes for some of the regressions
introduced by xserver 1.4, such as the keyboad caps/num-lock leds updates.
Tested by many.
2007-12-13 21:47:48 +00:00
matthieu
2fcd9ee667 xserver 1.4.0.90 2007-12-13 21:06:02 +00:00
matthieu
10fefb5e1b Fix logic error in the new dynamic array of pci devices that made
xf86scanpci() exit early if pciInit() had been called already.
Fix tested by krw@.
2007-12-10 06:35:24 +00:00
matthieu
35aebf7135 regen 2007-12-03 12:45:41 +00:00
matthieu
c19e24c0ad Revert xf86EnableIO()/xf86DisableIO() on macpcc to NOP for now. 2007-12-03 12:45:10 +00:00
matthieu
a7908c655f Support the new AGP device. Work by oga@ and me, with some ideas from
dim@ long ago.
2007-11-25 18:41:23 +00:00
matthieu
f080297623 OpenBSD's still using the old xkb data files. So rules are called "xorg" not
"base".
2007-11-25 15:32:26 +00:00
matthieu
fa710f4099 merge xserver 1.4, 1st pass 2007-11-24 19:04:00 +00:00
matthieu
b14d6de7aa xserver 1.4 2007-11-24 17:55:21 +00:00
matthieu
f1b8f80ce9 Pull patch from X.Org bugzilla #7364 from XF4 tree: fix for
potential unaligned access on 64 bit architectures.
2007-08-06 16:15:08 +00:00
matthieu
348dc7ad3d regen 2007-08-04 19:44:30 +00:00
matthieu
f1662182e6 regen 2007-06-30 06:57:45 +00:00
matthieu
d41b593701 Fix linking on OpenBSD/a.out systems. Tested by Nick@. 2007-06-30 06:38:56 +00:00
matthieu
3ef0e68671 regen 2007-06-23 21:49:28 +00:00
matthieu
85ea868e9d swap xOrigin and yOrigin in SProcRenderSetPictureClipRectangles.
Fixes Xrender clipping rectangles when X server and client are of
different endianness, shown by xterm 225 among others.
2007-06-13 22:53:10 +00:00
matthieu
82be1a48d9 Remove debugging code that was not supposed to leak in. 2007-05-31 03:37:55 +00:00
matthieu
9dc24fdb26 More stuff, mostly copied from Xwsfb and Xvesa 2007-05-29 20:14:43 +00:00
matthieu
b9d330da8e add a TODO list in case someone wants to help 2007-05-29 20:14:08 +00:00
matthieu
81442db855 kdrive doesn't support Xinput. 2007-05-27 05:56:03 +00:00
matthieu
255c61fb6a - rename some functions for consistancy
- fill more code
2007-05-27 05:17:06 +00:00
matthieu
871e6b9af8 sync 2007-05-27 05:13:15 +00:00
matthieu
487eac25a8 It's a bad idea to include rcs keywords in Makefile.am if
the generated Makefile.in  are also placed under CVS
unless you want an infinite number of commits.
2007-05-27 04:59:44 +00:00
matthieu
7778a382c8 Fill more holes. Still doesn't work. 2007-05-27 00:56:29 +00:00
matthieu
e3df64a137 Avoid using an unitialized variable as mouse info. 2007-05-27 00:55:09 +00:00
matthieu
6a7c974258 Force restore of text mode on exit. 2007-05-27 00:53:47 +00:00
matthieu
dae27eca2b Add support for 'W' axis. From "Gareth" garf at loveandnature dot co dot za.
Thanks.
2007-05-26 17:06:15 +00:00
matthieu
e7974dfd9e Start filling the holes. 2007-05-25 19:10:43 +00:00
matthieu
f23981ee52 sync 2007-05-25 18:19:55 +00:00
matthieu
fd0b119d1a Xwscons doesn't need agp support for now. 2007-05-25 18:15:57 +00:00
matthieu
bb17b92929 add 2007-05-25 18:13:35 +00:00
matthieu
a5e6045240 add 2007-05-25 16:46:59 +00:00
matthieu
c345d71fa6 Add a way to build Xwscons for those who want to hack on it. 2007-05-25 16:30:11 +00:00
matthieu
c7ebbd40e4 regen 2007-05-25 16:20:45 +00:00
matthieu
1656661794 Unbreak Xprint builds. Noticed by todd@. 2007-05-25 16:15:41 +00:00
matthieu
6949127de8 required bits to build Xwscons 2007-05-25 15:47:16 +00:00
matthieu
5bda13aab6 Add skeleton implentation of Xwscons a kdrive based X server for
wscons's dumb framebuffer mode. This is an empty shell for now.
2007-05-25 15:33:32 +00:00
matthieu
48be8e35f5 Don't build mesa on landisk. 2007-05-12 14:54:57 +00:00
matthieu
987805ed7b - Disable OpenGL parts on vax and sgi
- Disable Xprt on vax and landisk
Xenocara now builds on vax
2007-05-12 14:24:59 +00:00
matthieu
0ad4bd156e Fix for a divide by zero that can be triggered by a malicious client.
Problem reported by Derek Abdine of rapid7.com, patch by Keith Packard.
2007-05-02 09:56:36 +00:00
matthieu
f502a94636 Don't fall back to wsfb on autoconfig 2007-04-20 10:25:12 +00:00
matthieu
90a95c09bd plug memory leak on client disconnect. From X.Org git. 2007-04-18 22:21:17 +00:00
matthieu
fdc55d19a6 regen 2007-04-17 22:06:12 +00:00
matthieu
87c262d3c6 fix APM support. 2007-04-17 22:03:42 +00:00
matthieu
a981a1a884 Don't build the Xfree86 utils programs (mostly PCI based) on machines
which lack the capabilities to support them.
2007-04-15 17:42:08 +00:00
matthieu
3078572593 regen 2007-04-10 19:28:41 +00:00
matthieu
1a5c7d7f4a Fix test for sysv ipc. 2007-04-10 19:02:08 +00:00
todd
5a595260aa XC-MISC CVE-2007-1003
XC-MISC Extension ProcXCMiscGetXIDList Memory Corruption
 Vulnerability

This vulnerability was discovered by Sean Larsson, iDefense Labs.

from matthieu@
2007-04-04 02:50:29 +00:00
matthieu
ca57eb7602 XENOCARA_TOP -> XSRCDIR and now defaults to /usr/src/xenocara
XENOCARA_OBJDIR -> XOBJDIR  and now defaults to /usr/xobj
suggested by espie@ ok krw@ mbalmer@
2007-03-31 20:25:53 +00:00
matthieu
b521d84d2c build Xorg on armish. It will run on zaurus too. 2007-03-28 20:44:34 +00:00
matthieu
25e76c00a1 Fix the NO_XORG_OPTION logic. Noticed by todd@ on mvme68k. 2007-03-25 15:12:30 +00:00
matthieu
00a847b3f8 regen with libtool 1.5.22p9 2007-03-25 13:02:54 +00:00
matthieu
6637a9a36e regen with automake 1.9.6p2 2007-03-18 22:29:12 +00:00
matthieu
5f7406631b Don't assume files checked out of CVS are executable. 2007-03-18 20:15:29 +00:00
matthieu
fbd644a9c8 Remove one more generated file from source tree. Now the build date
in Xorg.0.log should be correct. Brought to my attention by Joerg Zinke.
2007-03-18 15:04:05 +00:00
matthieu
abb7dc6572 regen 2007-03-04 19:55:16 +00:00
matthieu
2ffc8239ef text -> test 2007-03-04 19:52:11 +00:00
matthieu
9dc3987317 regen 2007-03-03 11:33:26 +00:00
matthieu
8460feeb57 merge xserver 1.2.0 2007-03-03 11:31:18 +00:00
matthieu
8d298bc0f7 Import xserver version 1.2.0 (X.Org 7.2 final). 2007-03-03 11:09:19 +00:00
matthieu
0e8a23331b List of arches where we don't build Xorg. 2007-03-02 20:26:20 +00:00
matthieu
b9526a46a9 Clean up sockets after Xorg -configure. 2007-02-04 20:20:19 +00:00
matthieu
eb36c2bea5 white-space cleanup 2007-01-29 22:06:35 +00:00
matthieu
dedec17e25 CVE-2006-6101 CVE-2006-6102 CVE-2006-6103: The ProcDbeGetVisualInfo(),
ProcDbeSwapBuffer() and ProcRenderAddGlyphs() functions in the X server,
implementing requests for the dbe and render extensions, may be used
to overwrite data on the stack or in other parts of the X server memory.
2007-01-09 14:24:31 +00:00
matthieu
b9dbea8ec1 regen 2007-01-03 20:42:49 +00:00
matthieu
60329c3c4e Build fixes for OpenBSD/alpha. 2007-01-03 13:20:49 +00:00
matthieu
c8b5b0c730 Don't force the addition of a "mouse" section if none was found.
This heuristic to fix configuration errors is wrong when
a touch screen is the primary input device (zaurus).
2007-01-02 10:18:26 +00:00
matthieu
e1f972b588 Fix xkb data files locations. Problem noticed by Pierre-Yves Dampure and
Frederick C Druseikis who also sent a patch. Thanks.
2006-12-31 09:47:13 +00:00
matthieu
79f814011d regen 2006-12-17 22:17:44 +00:00
matthieu
880fa97d14 don't bother installing linux or solaris specific init scripts. 2006-12-17 22:12:21 +00:00
matthieu
f7655062be let datadir point to /usr/X11R6/share for now. 2006-12-17 21:46:45 +00:00
matthieu
c3d0302235 - merge xserver 1.1.99.903
- regen generated files
2006-12-16 20:59:13 +00:00
matthieu
09421e78f7 xserver 1.1.99.903 from X.Org 7.2RC3 2006-12-16 20:09:36 +00:00
matthieu
d5cad6f3f9 regen 2006-12-05 23:00:47 +00:00
matthieu
907ebadafc gcc 2.95 doesn't use the same serch rules for '-include' as gcc 3.
So fix build in a separate obj directory with gcc 2.95.
2006-12-05 23:00:22 +00:00
matthieu
7bb03d2e25 Sparc bus driver logic from XF4. Slightly different from the one in
X.Org, yet I missed it during previous merge.
2006-12-05 21:49:29 +00:00
matthieu
31b4956e7f More files generated by the build system. Pointed out by todd@. 2006-12-04 21:53:59 +00:00
matthieu
a7487677bf Appease gcc 2.95. 2006-12-04 20:28:28 +00:00
matthieu
3c9b7bfbe8 regen 2006-12-03 20:57:55 +00:00
matthieu
3ac80eece3 Build fixes for OpenBSD/zaurus:
- __arm32__ isn't defined by gcc on OpenBSD/arm
- ioperm_noop.c is needed in libxorgos
2006-12-03 20:57:39 +00:00
matthieu
7a36764563 regen 2006-12-01 20:38:55 +00:00
matthieu
ecbd4d28b3 Install xprint config in $datadir 2006-12-01 20:34:52 +00:00
matthieu
a4230f41d8 Xprint configuration goes to /etc 2006-12-01 20:29:51 +00:00
matthieu
d1e9c8b3b9 OpenBSD/i386 uses freebsdPci routines too. 2006-11-29 22:28:29 +00:00
matthieu
11e9fb01f9 regen 2006-11-28 20:33:06 +00:00
matthieu
c155af5f9a OpenBSD local modifications:
- privilege separation
- some snprintf/strlc{at,py} conversions
- support for more architectures
- signal handler fixes
- default mouse wheel support in config tools
- sunmouse protocol
2006-11-28 20:29:31 +00:00
matthieu
02c41bfd30 Remove RCS Id 2006-11-28 12:06:23 +00:00
matthieu
78e2e44741 $Xenocara$ -> $OpenBSD$ 2006-11-27 19:27:25 +00:00
matthieu
7589183e65 regenerate with OpenBSD autotools 2006-11-27 13:10:10 +00:00
matthieu
97bfc260ee regen with OpenBSD autotools 2006-11-26 19:09:56 +00:00
matthieu
d88df5f85e build infrastructure for xserver 2006-11-26 19:03:36 +00:00
matthieu
889b860699 Importing xserver from X.Org 7.2RC2 2006-11-26 18:13:41 +00:00