Attachment 5978 Details for Bug 7116 – xserver 1.1.0 patch

[patch] xserver 1.1.0 patch

xorg-xserver-1.1.0-setuid.diff (text/plain), 3.52 KB, created by Matthieu Herrb on 2006-06-19 14:44:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2006-06-19 14:44:05 UTC

Size: 3.52 KB

patch

obsolete

>Index: hw/xfree86/common/xf86Init.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
>retrieving revision 1.33.2.2
>diff -u -r1.33.2.2 xf86Init.c
>--- hw/xfree86/common/xf86Init.c	9 May 2006 18:04:19 -0000	1.33.2.2
>+++ hw/xfree86/common/xf86Init.c	19 Jun 2006 21:29:59 -0000
>@@ -1377,6 +1377,7 @@
>     }
>   
>   /* First the options that are only allowed for root */
>+  ErrorF("-- getuid() %d geteuid() %d\n", getuid(), geteuid());
>   if (getuid() == 0 || geteuid() != 0)
>   {
>     if (!strcmp(argv[i], "-modulepath"))
>@@ -1905,7 +1906,11 @@
>           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) {
>Index: hw/xfree86/os-support/shared/libc_wrapper.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v
>retrieving revision 1.11
>diff -u -r1.11 libc_wrapper.c
>--- hw/xfree86/os-support/shared/libc_wrapper.c	25 Mar 2006 19:52:04 -0000	1.11
>+++ hw/xfree86/os-support/shared/libc_wrapper.c	19 Jun 2006 21:30:00 -0000
>@@ -1270,7 +1270,10 @@
> #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++)
>Index: hw/xfree86/parser/write.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v
>retrieving revision 1.3
>diff -u -r1.3 write.c
>--- hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
>+++ hw/xfree86/parser/write.c	19 Jun 2006 21:30:00 -0000
>@@ -170,7 +170,10 @@
> 					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;
>Index: os/utils.c
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
>retrieving revision 1.25
>diff -u -r1.25 utils.c
>--- os/utils.c	25 Mar 2006 19:52:05 -0000	1.25
>+++ os/utils.c	19 Jun 2006 21:30:02 -0000
>@@ -1721,8 +1721,10 @@
>     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 */
>@@ -1773,8 +1775,10 @@
> 	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 */
>@@ -1848,8 +1852,10 @@
> 	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 */

Actions: View | Splinter Review

Attachments on bug 7116: 5818 | 5819 | 5820 | 5973 | 5974 | 5975 | 5976 | 5977 | 5978 | 5979 | 5980 | 5981 | 5983

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.