--- xorg-x11-6.9.0/xc/lib/X11/lcFile.c.cve-2006-4447 2005-05-13 16:53:44.000000000 -0600
+++ xorg-x11-6.9.0/xc/lib/X11/lcFile.c 2006-08-31 08:42:03.000000000 -0600
@@ -269,7 +269,11 @@ xlocaledir(
if (seteuid(0) != 0) {
priv = 0;
} else {
- seteuid(oldeuid);
+ if (seteuid(oldeuid) == -1) {
+ /* XXX ouch, coudn't get back to original uid
+ what can we do ??? */
+ _exit(127);
+ }
priv = 1;
}
#endif
--- xorg-x11-6.9.0/xc/lib/xtrans/Xtranslcl.c.cve-2006-4447 2005-11-07 23:33:26.000000000 -0700
+++ xorg-x11-6.9.0/xc/lib/xtrans/Xtranslcl.c 2006-08-31 08:42:03.000000000 -0600
@@ -360,7 +360,10 @@ TRANS(PTSOpenClient)(XtransConnInfo cipt
uid_t saved_euid;
saved_euid = geteuid();
- setuid( getuid() ); /** sets the euid to the actual/real uid **/
+ /** sets the euid to the actual/real uid **/
+ if (setuid( getuid() ) == -1) {
+ exit(1);
+ }
if( chown( slave, saved_euid, -1 ) < 0 ) {
exit( 1 );
}
@@ -369,7 +372,13 @@ TRANS(PTSOpenClient)(XtransConnInfo cipt
}
waitpid(saved_pid, &exitval, 0);
-
+ if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
+ close(fd);
+ close(server);
+ PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n",
+ slave, 0, 0);
+ return(-1);
+ }
if (chmod(slave, 0666) < 0) {
close(fd);
close(server);
--- xorg-x11-6.9.0/xc/config/util/chownxterm.c.cve-2006-4447 2003-11-14 09:48:20.000000000 -0700
+++ xorg-x11-6.9.0/xc/config/util/chownxterm.c 2006-08-31 08:42:03.000000000 -0600
@@ -41,8 +41,10 @@ char *prog_name;
void help()
{
- setgid(getgid());
- setuid(getuid());
+ if (setgid(getgid()) == -1)
+ exit(1);
+ if (setuid(getuid()) == -1)
+ exit(1);
printf("chown-xterm makes %s suid root\n", XTERM_PATH);
printf("This is necessary on Ultrix for /dev/tty operation.\n");
exit(0);
@@ -51,8 +53,10 @@ void help()
void print_error(err_string)
char *err_string;
{
- setgid(getgid());
- setuid(getuid());
+ if (setgid(getgid()) == -1)
+ exit(1);
+ if (setuid(getuid()) == -1)
+ exit(1);
fprintf(stderr, "%s: \"%s\"", prog_name, err_string);
perror(" failed");
exit(1);
--- xorg-x11-6.9.0/xc/programs/xdm/session.c.cve-2006-4447 2005-11-07 23:33:31.000000000 -0700
+++ xorg-x11-6.9.0/xc/programs/xdm/session.c 2006-08-31 08:45:12.989593692 -0600
@@ -488,8 +488,14 @@ SessionExit (struct display *d, int stat
else
ResetServer (d);
if (removeAuth) {
- setgid (verify.gid);
- setuid (verify.uid);
+ if (setgid (verify.gid) == -1) {
+ LogError( "SessionExit: setgid: %s\n", strerror(errno));
+ exit(status);
+ }
+ if (setuid (verify.uid) == -1) {
+ LogError( "SessionExit: setuid: %s\n", strerror(errno));
+ exit(status);
+ }
RemoveUserAuthorization (d, &verify);
#ifdef K5AUTH
/* do like "kdestroy" program */
--- xorg-x11-6.9.0/xc/programs/xdm/xdmshell.c.cve-2006-4447 2005-07-14 16:58:25.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/xdm/xdmshell.c 2006-08-31 08:42:07.000000000 -0600
@@ -183,7 +183,11 @@ main (
#endif
/* make xdm run in a non-setuid environment */
- setuid (geteuid());
+ if (setuid (geteuid()) == -1) {
+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
+ ProgramName, errno, strerror(errno));
+ exit(1);
+ }
/*
* exec /usr/bin/X11/xdm -nodaemon -udpPort 0
--- xorg-x11-6.9.0/xc/programs/xinit/xinit.c.cve-2006-4447 2006-08-31 08:36:44.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/xinit/xinit.c 2006-08-31 08:56:08.294598791 -0600
@@ -694,7 +694,10 @@ static int
startClient(char *client[])
{
if ((clientpid = vfork()) == 0) {
- setuid(getuid());
+ if (setuid(getuid()) == -1) {
+ Error("cannot change uid: %s\n", strerror(errno));
+ _exit(ERR_EXIT);
+ }
setpgrp(0, getpid());
environ = newenviron;
#ifdef __UNIXOS2__
--- xorg-x11-6.9.0/xc/programs/xload/xload.c.cve-2006-4447 2004-04-23 13:54:57.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/xload/xload.c 2006-08-31 08:42:08.000000000 -0600
@@ -34,7 +34,7 @@ from the X Consortium.
* xload - display system load average in a window
*/
-
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -162,8 +162,17 @@ main(int argc, char **argv)
/* For security reasons, we reset our uid/gid after doing the necessary
system initialization and before calling any X routines. */
InitLoadPoint();
- setgid(getgid()); /* reset gid first while still (maybe) root */
- setuid(getuid());
+ /* reset gid first while still (maybe) root */
+ if (setgid(getgid()) == -1) {
+ fprintf(stderr, "%s: setgid failed: %s\n",
+ ProgramName, strerror(errno));
+ exit(1);
+ }
+ if (setuid(getuid()) == -1) {
+ fprintf(stderr, "%s: setuid failed: %s\n",
+ ProgramName, strerror(errno));
+ exit(1);
+ }
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
--- xorg-x11-6.9.0/xc/programs/xterm/misc.c.cve-2006-4447 2005-12-14 16:28:27.000000000 -0700
+++ xorg-x11-6.9.0/xc/programs/xterm/misc.c 2006-08-31 08:42:08.000000000 -0600
@@ -1094,8 +1094,10 @@ creat_as(uid_t uid, gid_t gid, Bool appe
pid = fork();
switch (pid) {
case 0: /* child */
- setgid(gid);
- setuid(uid);
+ if (setgid(gid) == -1)
+ _exit(ERROR_SETUID);
+ if (setuid(uid) == -1)
+ _exit(ERROR_SETUID);
fd = open(pathname,
O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
mode);
@@ -1262,8 +1264,10 @@ StartLog(TScreen * screen)
signal(SIGCHLD, SIG_DFL);
/* (this is redundant) */
- setgid(screen->gid);
- setuid(screen->uid);
+ if (setgid(screen->gid) == -1)
+ exit(ERROR_SETUID);
+ if (setuid(screen->uid) == -1)
+ exit(ERROR_SETUID);
execl(shell, shell, "-c", &screen->logfile[1], (void *) 0);
--- xorg-x11-6.9.0/xc/programs/xterm/main.c.cve-2006-4447 2005-12-14 16:28:27.000000000 -0700
+++ xorg-x11-6.9.0/xc/programs/xterm/main.c 2006-08-31 08:42:08.000000000 -0600
@@ -1592,8 +1592,10 @@ main(int argc, char *argv[]ENVP_ARG)
Window winToEmbedInto = None;
#ifdef DISABLE_SETUID
- seteuid(getuid());
- setuid(getuid());
+ if (seteuid(getuid()) == -1)
+ exit(2);
+ if (setuid(getuid()) == -1)
+ exit(2);
#endif
ProgramName = argv[0];
@@ -1619,8 +1621,16 @@ main(int argc, char *argv[]ENVP_ARG)
#if defined(USE_UTMP_SETGID)
get_pty(NULL, NULL);
- seteuid(getuid());
- setuid(getuid());
+ if (seteuid(getuid()) == -1) {
+ fprintf(stderr,
+ "%s: unable to change back euid\n", ProgramName);
+ exit(1);
+ }
+ if (setuid(getuid()) == -1) {
+ fprintf(stderr,
+ "%s: unable to change back uid\n", ProgramName);
+ exit(1);
+ }
#define get_pty(pty, from) really_get_pty(pty, from)
#endif
--- xorg-x11-6.9.0/xc/programs/xterm/print.c.cve-2006-4447 2005-08-05 10:13:04.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/xterm/print.c 2006-08-31 08:42:08.000000000 -0600
@@ -387,9 +387,11 @@ charToPrinter(int chr)
dup2(fileno(stderr), 2);
close(fileno(stderr));
}
-
- setgid(screen->gid); /* don't want privileges! */
- setuid(screen->uid);
+ /* don't want privileges! */
+ if (setgid(screen->gid) == -1)
+ exit(2);
+ if (setuid(screen->uid) == -1)
+ exit(2);
Printer = popen(screen->printer_command, "w");
input = fdopen(my_pipe[0], "r");
--- xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/common/xf86Init.c.cve-2006-4447 2006-08-31 08:36:46.432712815 -0600
+++ xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2006-08-31 09:02:18.173255804 -0600
@@ -1905,7 +1905,11 @@ xf86RunVtInit(void)
FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
break;
case 0: /* child */
- setuid(getuid());
+ if (setuid(getuid()) == -1) {
+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
+ strerror(errno));
+ exit(255);
+ }
/* set stdin, stdout to the consoleFd */
for (i = 0; i < 2; i++) {
if (xf86Info.consoleFd != i) {
--- xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/parser/write.c.cve-2006-4447 2005-07-03 01:01:37.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/parser/write.c 2006-08-31 08:42:04.000000000 -0600
@@ -170,7 +170,10 @@ xf86writeConfigFile (const char *filenam
strerror(errno));
return 0;
case 0: /* child */
- setuid(getuid());
+ if (setuid(getuid() == -1)
+ FatalError("xf86writeConfigFile(): "
+ "setuid failed(%s)\n",
+ strerror(errno));
ret = doWriteConfigFile(filename, cptr);
exit(ret);
break;
--- xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c.cve-2006-4447 2006-08-31 08:36:42.472401738 -0600
+++ xorg-x11-6.9.0/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 2006-08-31 08:42:04.000000000 -0600
@@ -1271,7 +1271,10 @@ xf86execl(const char *pathname, const ch
#ifndef SELF_CONTAINED_WRAPPER
xf86DisableIO();
#endif
- setuid(getuid());
+ if (setuid(getuid()) == -1) {
+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
+ exit(255);
+ }
#if !defined(SELF_CONTAINED_WRAPPER)
/* set stdin, stdout to the consoleFD, and leave stderr alone */
for (i = 0; i < 2; i++)
--- xorg-x11-6.9.0/xc/programs/Xserver/os/utils.c.cve-2006-4447 2005-11-07 23:33:30.000000000 -0700
+++ xorg-x11-6.9.0/xc/programs/Xserver/os/utils.c 2006-08-31 09:05:32.159510535 -0600
@@ -1718,8 +1718,10 @@ System(char *command)
case -1: /* error */
p = -1;
case 0: /* child */
- setgid(getgid());
- setuid(getuid());
+ if (setgid(getgid()) == -1)
+ _exit(127);
+ if (setuid(getuid()) == -1)
+ _exit(127);
execl("/bin/sh", "sh", "-c", command, (char *)NULL);
_exit(127);
default: /* parent */
@@ -1770,8 +1772,10 @@ Popen(char *command, char *type)
xfree(cur);
return NULL;
case 0: /* child */
- setgid(getgid());
- setuid(getuid());
+ if (setgid(getgid()) == -1)
+ _exit(127);
+ if (setuid(getuid()) == -1)
+ _exit(127);
if (*type == 'r') {
if (pdes[1] != 1) {
/* stdout */
@@ -1845,8 +1849,10 @@ Fopen(char *file, char *type)
xfree(cur);
return NULL;
case 0: /* child */
- setgid(getgid());
- setuid(getuid());
+ if (setgid(getgid()) == -1)
+ _exit(127);
+ if (setuid(getuid()) == -1)
+ _exit(127);
if (*type == 'r') {
if (pdes[1] != 1) {
/* stdout */
--- xorg-x11-6.9.0/xc/programs/xf86dga/dga.c.cve-2006-4447 2004-04-23 13:54:47.000000000 -0600
+++ xorg-x11-6.9.0/xc/programs/xf86dga/dga.c 2006-08-31 08:42:07.000000000 -0600
@@ -16,6 +16,7 @@
#include <X11/Xmd.h>
#include <X11/extensions/xf86dga.h>
#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
@@ -141,7 +142,10 @@ main(int argc, char *argv[])
#ifndef __UNIXOS2__
/* Give up root privs */
- setuid(getuid());
+ if (setuid(getuid()) == -1) {
+ fprintf(stderr, "Unable to change uid: %s\n", strerror(errno));
+ exit(2);
+ }
#endif
XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
