qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,920 Commits 1 Branch 0 Tags 396 MiB
10ad330859
Commit Graph

60 Commits

Author SHA1 Message Date
matthieu
1c882161e8 In priv_open_device() allow opening tty[E-J]0. While there remove 
ttyD[1-7] from the list, since those devices will never get used by X.
 2012-08-14 15:57:57 +00:00
matthieu
1996326d50 Fix a logic introducred in rev 1.23. The parent pid is initialized 
by the main X server too late in the privsep case (already in the
unpriviliged child). So keep the early init for this case.
 2012-08-12 14:06:42 +00:00
matthieu
5f8132e311 Add privsep prototypes to osdep.h 2012-08-07 20:16:12 +00:00
matthieu
c7c0180b4c In non-privilege sepration mode, avoid accidentally sending 
a SIGUSR1 signal to init(8).

It can happen that xdm dies before the X server that it started.
In that case X's is reparented by init...

This is handled correctly when privilege separation is not compiled
but got overlooked in the privilege separation case.
 2012-08-07 20:15:23 +00:00
matthieu
4f2bf5df6d Rename 'socket' parameter to avoid shadowing the global declaration. 2012-08-07 20:13:18 +00:00
matthieu
eb59960f12 regen autotools 2012-08-05 18:14:29 +00:00
matthieu
e60da74507 Update to xserver 1.12.2. tested by naddy@, krw@, mpi@. 2012-06-10 13:21:05 +00:00
matthieu
b4a75b3e96 Return an error much earlier if recvmsg fails. 2012-04-04 20:34:55 +00:00
matthieu
9576ef223d Update to xserver 1.11.4. tested by krw@, shadchin@. 2012-01-31 07:52:35 +00:00
matthieu
4344ac3914 Bugfix Update to xserver 1.11.3 2011-12-18 16:08:59 +00:00
matthieu
61a7d5427d Update to xserver 1.11.2 2011-11-05 13:32:40 +00:00
matthieu
a05754665a Fix CVE-2011-4028: File disclosure vulnerability. 
use O_NOFOLLOW to open the existing lock file, so symbolic links
aren't followed, thus avoid revealing if it point to an existing file.

Note that xserver on OpenBSD isn't affected by CVE-2011-4029.
 2011-10-18 14:58:36 +00:00
matthieu
b9f30b39b5 Remove warnings emitted when a device can't be opened. This 
is just noise and now happens while the X autoconfiguration
code probes all /dev/wsmouse<n> devices.
If the error matters, the driver will emit a proper error
nevertheless.
 2011-08-20 17:30:37 +00:00
matthieu
a4d630d049 regen 2011-06-29 19:57:45 +00:00
matthieu
4a238ea6a4 Update to xserver 1.9.5. Tested by jasper@, ajacoutot@ and krw@ 2011-04-02 16:08:38 +00:00
matthieu
3870417379 restart recvmsg() if returning with errno==EINTR. 
Fixes a crash on server reset on some machines.
Code inspired by ssh, with feedback from guenther@ and millert@
ok guenther@ miod@
 2011-01-28 19:37:55 +00:00
matthieu
55b9b068ae Bring fix from rev 1.12 back once more. ok oga@. 2010-12-22 21:36:05 +00:00
matthieu
dd56fb17b5 Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@ 
in various configurations.
 2010-12-21 20:10:44 +00:00
matthieu
428261197a Upgrade to xorg-server 1.9.2. 
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
 2010-12-05 15:36:02 +00:00
matthieu
d57b1a146f regen (yes lots of files, since util-macros has been updated). 2010-09-01 13:43:24 +00:00
matthieu
95d684a05b Update to xserver 1.8. Tested by many. Ok oga@, todd@. 2010-07-27 19:02:24 +00:00
matthieu
49012820cb Add a configure test for newer proto headers and use it to enable 
building xserver 1.6 with those headers. ok oga@.
 2010-04-13 19:54:46 +00:00
matthieu
0026b7ed04 restore version 1.12 of privsep.c which got accidentally reverted 
by my xserver 1.6 merge. noticed by oga@
 2009-09-08 19:52:26 +00:00
matthieu
88f6f3ea75 update to xserver 1.6.4rc1. Tested by many, ok oga@. 2009-09-06 19:44:18 +00:00
oga
251e57a556 Make the !privsep and privsep paths a little more similar (still 
checking the list), this allows drm to work in -keepPriv situations.

This diff has been in my tree awaiting proper testing for months, now
i'm sure it works correctly in it goes.

ok matthieu@ an aeon ago.
 2009-07-14 18:25:16 +00:00
matthieu
8d98f5900d regen 2009-01-12 20:18:51 +00:00
matthieu
369cc172f4 Update to xserver 1.5.3 + latests commits on server-1.5-branch. 
tested by stsp@, david@, form@, ckuethe@, oga@. thanks.
 2009-01-12 20:17:47 +00:00
matthieu
60021fe985 xserver 1.5.2. tested by ckuethe@, oga@, and others. 2008-11-02 15:26:08 +00:00
matthieu
9c77348456 Close well known connections in ServerAbort(). 
Gets rid of dangling /tmp/.X11-unix/X0 sockets after server crash.
 2008-10-30 19:59:59 +00:00
mbalmer
6ce13d3a8e Add /dev/tty04 to the list of devices privilege separated X can open. 
(The IBM SurePos 500 has six serial lines and the touch screen is at
this device).

ok oga@
 2008-08-28 17:50:21 +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
48bc822959 regen. 2008-05-24 20:39:01 +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
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
daec730aa0 Remove empty unused files. 2008-02-11 22:59:20 +00:00
jsing
6189593aff regen 2008-01-04 14:01:04 +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
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
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
c7ebbd40e4 regen 2007-05-25 16:20:45 +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