github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

bugfix: check for --quiet/--debug earlier during init (#6969)

Browse source 
Parse them as early as possible (after dropping permissions, etc), as
`checkcfg()` checks for `arg_debug` (for example).

Relates to #6878 #6951.

Kind of relates to #6579.
This commit is contained in:
Kelvin M. Klann 2025-11-22 09:07:10 +00:00 • committed by GitHub
parent 86b15acf2d
commit d2bd561a69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/firejail/main.c
View file

@ -1075,20 +1075,33 @@ int main(int argc, char **argv, char **envp) {
// check standard streams before opening any file
fix_std_streams();
// initialize values from firejail.config (needed for arg/env checks)
checkcfg(0);
// argument count should be larger than 0
if (argc == 0 || !argv || strlen(argv[0]) == 0) {
fprintf(stderr, "Error: argv is invalid\n");
exit(1);
} else if (argc >= arg_max_count) {
}
// process --quiet
const char *env_quiet = env_get("FIREJAIL_QUIET");
if (check_arg(argc, argv, "--quiet", 1) || (env_quiet && strcmp(env_quiet, "yes") == 0))
arg_quiet = 1;
// process --debug
if (check_arg(argc, argv, "--debug", 1)) {
arg_debug = 1;
arg_quiet = 0;
}
// initialize values from firejail.config (needed for arg/env checks)
checkcfg(0);
// sanity check for arguments
if (argc >= arg_max_count) {
fprintf(stderr, "Error: too many arguments: argc (%d) >= arg-max-count (%d)\n",
argc, arg_max_count);
exit(1);
}
// sanity check for arguments
for (i = 0; i < argc; i++) {
if (strlen(argv[i]) >= arg_max_len) {
fprintf(stderr, "Error: too long argument: argv[%d] len (%zu) >= arg-max-len (%lu): '%s'\n",
@ -1111,17 +1124,6 @@ int main(int argc, char **argv, char **envp) {
// Reapply a minimal set of environment variables
env_apply_whitelist();
// process --quiet
const char *env_quiet = env_get("FIREJAIL_QUIET");
if (check_arg(argc, argv, "--quiet", 1) || (env_quiet && strcmp(env_quiet, "yes") == 0))
arg_quiet = 1;
// process --debug
if (check_arg(argc, argv, "--debug", 1)) {
arg_debug = 1;
arg_quiet = 0;
}
// check if the user is allowed to use firejail
init_cfg(argc, argv);