qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MFC: Disable -logfile and -modulepath when running with elevated

Browse Source 
privileges.  This Could cause arbitrary files overwrite.
CVE-2018-14665.
This commit is contained in:
matthieu 2018-10-25 15:44:27 +00:00
parent e897f28b00
commit 2d6e93a5b7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xserver/hw/xfree86/common/xf86Init.c
View File

@ -1145,14 +1145,18 @@ ddxProcessArgument(int argc, char **argv, int i)
/* First the options that are not allowed with elevated privileges */ /* First the options that are not allowed with elevated privileges */
if (!strcmp(argv[i], "-modulepath")) { if (!strcmp(argv[i], "-modulepath")) {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]); if (xf86PrivsElevated())
FatalError("\nInvalid argument -modulepath "
"with elevated privileges\n");
xf86ModulePath = argv[i + 1]; xf86ModulePath = argv[i + 1];
xf86ModPathFrom = X_CMDLINE; xf86ModPathFrom = X_CMDLINE;
return 2; return 2;
} }
if (!strcmp(argv[i], "-logfile")) { if (!strcmp(argv[i], "-logfile")) {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
xf86CheckPrivs(argv[i], argv[i + 1]); if (xf86PrivsElevated())
FatalError("\nInvalid argument -logfile "
"with elevated privileges\n");
xf86LogFile = argv[i + 1]; xf86LogFile = argv[i + 1];
xf86LogFileFrom = X_CMDLINE; xf86LogFileFrom = X_CMDLINE;
return 2; return 2;