diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | etc/geary.profile | 2 | ||||
-rw-r--r-- | src/firejail/util.c | 4 |
3 files changed, 6 insertions, 2 deletions
@@ -138,6 +138,8 @@ emacsomancer (https://github.com/emacsomancer) | |||
138 | - added profile for Conkeror browser | 138 | - added profile for Conkeror browser |
139 | eventyrer (https://github.com/eventyrer) | 139 | eventyrer (https://github.com/eventyrer) |
140 | - update gnome-mplayer.profile | 140 | - update gnome-mplayer.profile |
141 | Fabian Würfl (https://github.com/BafDyce) | ||
142 | - fixed race condition when creating a new directory | ||
141 | Felipe Barriga Richards (https://github.com/fbarriga) | 143 | Felipe Barriga Richards (https://github.com/fbarriga) |
142 | - --private-etc fix | 144 | - --private-etc fix |
143 | Franco (nextime) Lanza (https://github.com/nextime) | 145 | Franco (nextime) Lanza (https://github.com/nextime) |
diff --git a/etc/geary.profile b/etc/geary.profile index 1b702c83c..f655f0efe 100644 --- a/etc/geary.profile +++ b/etc/geary.profile | |||
@@ -3,7 +3,7 @@ include /etc/firejail/globals.local | |||
3 | 3 | ||
4 | # This file is overwritten during software install. | 4 | # This file is overwritten during software install. |
5 | # Persistent customizations should go in a .local file. | 5 | # Persistent customizations should go in a .local file. |
6 | include /etc/firejail/geray.local | 6 | include /etc/firejail/geary.local |
7 | 7 | ||
8 | # Firejail profile for Gnome Geary | 8 | # Firejail profile for Gnome Geary |
9 | # Users have Geary set to open a browser by clicking a link in an email | 9 | # Users have Geary set to open a browser by clicking a link in an email |
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"); |