diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firecfg/firecfg.config | 1 | ||||
-rw-r--r-- | src/firejail/util.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 6a93f4976..c616f040c 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -142,6 +142,7 @@ kwrite | |||
142 | leafpad | 142 | leafpad |
143 | less | 143 | less |
144 | libreoffice | 144 | libreoffice |
145 | liferea | ||
145 | localc | 146 | localc |
146 | lodraw | 147 | lodraw |
147 | loffice | 148 | loffice |
diff --git a/src/firejail/util.c b/src/firejail/util.c index acbc19234..9ad7271ba 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -821,7 +821,9 @@ void create_empty_dir_as_root(const char *dir, mode_t mode) { | |||
821 | if (arg_debug) | 821 | if (arg_debug) |
822 | printf("Creating empty %s directory\n", dir); | 822 | printf("Creating empty %s directory\n", dir); |
823 | /* coverity[toctou] */ | 823 | /* coverity[toctou] */ |
824 | if (mkdir(dir, mode) == -1) | 824 | // don't fail if directory already exists. This can be the case in a race |
825 | // condition, when two jails launch at the same time. See #1013 | ||
826 | if (mkdir(dir, mode) == -1 && errno != EEXIST) | ||
825 | errExit("mkdir"); | 827 | errExit("mkdir"); |
826 | if (set_perms(dir, 0, 0, mode)) | 828 | if (set_perms(dir, 0, 0, mode)) |
827 | errExit("set_perms"); | 829 | errExit("set_perms"); |