diff options
-rw-r--r-- | etc/mousepad.profile | 2 | ||||
-rw-r--r-- | src/firejail/fs_lib.c | 10 | ||||
-rw-r--r-- | src/firejail/fs_lib2.c | 7 | ||||
-rwxr-xr-x | test/private-lib/private-lib.sh | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/etc/mousepad.profile b/etc/mousepad.profile index 85344db5d..e44750f99 100644 --- a/etc/mousepad.profile +++ b/etc/mousepad.profile | |||
@@ -29,5 +29,5 @@ tracelog | |||
29 | 29 | ||
30 | private-bin mousepad | 30 | private-bin mousepad |
31 | private-dev | 31 | private-dev |
32 | private-lib gio | 32 | private-lib |
33 | private-tmp | 33 | private-tmp |
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index 2cb32fe69..18739c554 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -274,10 +274,9 @@ void fs_private_lib(void) { | |||
274 | if (lib) { | 274 | if (lib) { |
275 | if (is_dir(lib)) | 275 | if (is_dir(lib)) |
276 | fslib_copy_dir(lib); | 276 | fslib_copy_dir(lib); |
277 | else { | 277 | else |
278 | fslib_duplicate(lib); | ||
279 | fslib_copy_libs(lib); | 278 | fslib_copy_libs(lib); |
280 | } | 279 | fslib_copy_libs(lib); |
281 | free(lib); | 280 | free(lib); |
282 | } | 281 | } |
283 | 282 | ||
@@ -286,10 +285,9 @@ void fs_private_lib(void) { | |||
286 | if (lib) { | 285 | if (lib) { |
287 | if (is_dir(lib)) | 286 | if (is_dir(lib)) |
288 | fslib_copy_dir(lib); | 287 | fslib_copy_dir(lib); |
289 | else { | 288 | else |
290 | fslib_duplicate(lib); | 289 | fslib_duplicate(lib); |
291 | fslib_copy_libs(lib); | 290 | fslib_copy_libs(lib); |
292 | } | ||
293 | free(lib); | 291 | free(lib); |
294 | } | 292 | } |
295 | } | 293 | } |
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c index 307a6b11b..86e7c0ba7 100644 --- a/src/firejail/fs_lib2.c +++ b/src/firejail/fs_lib2.c | |||
@@ -184,6 +184,13 @@ SysLib syslibs[] = { | |||
184 | "", // dir2 | 184 | "", // dir2 |
185 | "GIRepository" // message | 185 | "GIRepository" // message |
186 | }, | 186 | }, |
187 | { // GIO | ||
188 | "libgio", // library | ||
189 | 0, 0, // len and found flag | ||
190 | "gio", // dir1 | ||
191 | "", // dir2 | ||
192 | "GIO" // message | ||
193 | }, | ||
187 | { // Enchant speller | 194 | { // Enchant speller |
188 | "libenchant.so.", // library | 195 | "libenchant.so.", // library |
189 | 0, 0, // len and found flag | 196 | 0, 0, // len and found flag |
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh index 2449e91d7..6e0881273 100755 --- a/test/private-lib/private-lib.sh +++ b/test/private-lib/private-lib.sh | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | 7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) |
8 | LIST="evince galculator gnome-calculator hexchat leafpad mousepad transmission-gtk xcalc atril gpicview eom eog" | 8 | LIST="evince galculator gnome-calculator leafpad mousepad transmission-gtk xcalc atril gpicview eom eog" |
9 | 9 | ||
10 | 10 | ||
11 | for app in $LIST; do | 11 | for app in $LIST; do |