summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2009-11-14 18:39:00 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2009-11-19 16:37:03 +1000
commitbebf7b1a342eaa37849a5b373bd1a507052233a8 (patch)
treeb4718de70d1adf1971c3c562df953c5b4be719a1
parente6872c89bcb8a0308cf83089194051e0ef69fba9 (diff)
xfree86: set a sane umask before opening the log
Xorg creates its log file following the umask of the user running startx, which may result in a world-writable log. Set umask to 022 to prevent this. Debian bug#555308 <http://bugs.debian.org/555308> See also http://thread.gmane.org/gmane.comp.security.oss.general/2299 Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 30be7ceaf228497ac1ff0a1123c1b35e3aa1fc73)
-rw-r--r--hw/xfree86/common/xf86Init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index c9baff3ef..d3de6701c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1142,8 +1142,10 @@ OsVendorInit(void)
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
#endif
- if (!beenHere)
+ if (!beenHere) {
+ umask(022);
xf86LogInit();
+ }
/* Set stderr to non-blocking. */
#ifndef O_NONBLOCK