Add patch from X.Org, fixing privilege escalation.

Security:	http://www.vuxml.org/61534682-b8f4-11da-8e62-000e0c33c2dc
Security:	CVE-2006-0745
This commit is contained in:
Dejan Lesjak 2006-03-21 17:06:39 +00:00
parent 461e2908dc
commit 6f9bc91b6d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157904
2 changed files with 21 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 6.9.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src

View File

@ -0,0 +1,20 @@
--- programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2006-03-17 23:30:10.000000000 +0200
+++ programs/Xserver/hw/xfree86/common/xf86Init.c 2006-03-17 23:29:35.000000000 +0200
@@ -1376,7 +1376,7 @@
}
/* First the options that are only allowed for root */
- if (getuid() == 0 || geteuid != 0)
+ if (getuid() == 0 || geteuid() != 0)
{
if (!strcmp(argv[i], "-modulepath"))
{
@@ -1679,7 +1679,7 @@
}
if (!strcmp(argv[i], "-configure"))
{
- if (getuid() != 0 && geteuid == 0) {
+ if (getuid() != 0 && geteuid() == 0) {
ErrorF("The '-configure' option can only be used by root.\n");
exit(1);
}