andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: factor out the check priviliges and print a big warning

Browse Source 
Current message was quite off "file specified must be a relative path"
and alike. Just factor it out and use "path/file" as needed.

v2: Rework error message, drop "Using default", print actual arg value.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2016-05-02 23:47:20 +01:00 committed by Adam Jackson
parent 2378adde67
commit 0fdd475604
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xfree86/common/xf86Init.c
View File

@ -1090,6 +1090,16 @@ xf86PrintDefaultLibraryPath(void)
ErrorF("%s\n", DEFAULT_LIBRARY_PATH); ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
} }
static void
xf86CheckPrivs(const char *option, const char *arg)
{
if (xf86PrivsElevated() && !xf86PathIsSafe(arg)) {
FatalError("\nInvalid argument for %s - \"%s\"\n"
"\tWith elevated privileges %s must specify a relative path\n"
"\twithout any \"..\" elements.\n\n", option, arg, option);
}
}
/* /*
* ddxProcessArgument -- * ddxProcessArgument --
* Process device-dependent command line args. Returns 0 if argument is * Process device-dependent command line args. Returns 0 if argument is
@ -1140,25 +1150,13 @@ ddxProcessArgument(int argc, char **argv, int i)
} }
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) { if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) { xf86CheckPrivs(argv[i], argv[i + 1]);
FatalError("\nInvalid argument for %s\n"
"\tWith elevated privileges, the file specified with %s must be\n"
"\ta relative path and must not contain any \"..\" elements.\n"
"\tUsing default " __XCONFIGFILE__ " search path.\n\n",
argv[i], argv[i]);
}
xf86ConfigFile = argv[i + 1]; xf86ConfigFile = argv[i + 1];
return 2; return 2;
} }
if (!strcmp(argv[i], "-configdir")) { if (!strcmp(argv[i], "-configdir")) {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) { xf86CheckPrivs(argv[i], argv[i + 1]);
FatalError("\nInvalid argument for %s\n"
"\tWith elevated privileges, the file specified with %s must be\n"
"\ta relative path and must not contain any \"..\" elements.\n"
"\tUsing default " __XCONFIGDIR__ " search path.\n\n",
argv[i], argv[i]);
}
xf86ConfigDir = argv[i + 1]; xf86ConfigDir = argv[i + 1];
return 2; return 2;
} }