diff options
author | smitsohu <smitsohu@gmail.com> | 2018-07-16 02:03:56 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-07-16 02:03:56 +0200 |
commit | 77a938f33579df6f76c55c96c7aafb5a0c9e68b5 (patch) | |
tree | cf4b5ce3b3a3c86b335fa9c33dc71470ef0ceb95 | |
parent | set umask for internal use (diff) | |
parent | Fix indentation (diff) | |
download | firejail-77a938f33579df6f76c55c96c7aafb5a0c9e68b5.tar.gz firejail-77a938f33579df6f76c55c96c7aafb5a0c9e68b5.tar.zst firejail-77a938f33579df6f76c55c96c7aafb5a0c9e68b5.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | src/firejail/fs_lib.c | 3 | ||||
-rwxr-xr-x | test/fs/whitelist-dev.exp | 3 |
3 files changed, 7 insertions, 3 deletions
@@ -149,13 +149,13 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe | |||
149 | Example: | 149 | Example: |
150 | $ firejail --keep-dev-shm --private-dev | 150 | $ firejail --keep-dev-shm --private-dev |
151 | 151 | ||
152 | --nou2f | 152 | --nou2f |
153 | Disable U2F devices. | 153 | Disable U2F devices. |
154 | 154 | ||
155 | Example: | 155 | Example: |
156 | $ firejail --nou2f | 156 | $ firejail --nou2f |
157 | 157 | ||
158 | --private-cache | 158 | --private-cache |
159 | Mount an empty temporary filesystem on top of the .cache | 159 | Mount an empty temporary filesystem on top of the .cache |
160 | directory in user home. All modifications are discarded | 160 | directory in user home. All modifications are discarded |
161 | when the sandbox is closed. | 161 | when the sandbox is closed. |
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index 501188ca7..77c9a0cf5 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -246,6 +246,7 @@ static void install_list_entry(const char *lib) { | |||
246 | 246 | ||
247 | 247 | ||
248 | void fslib_install_list(const char *lib_list) { | 248 | void fslib_install_list(const char *lib_list) { |
249 | assert(lib_list); | ||
249 | if (arg_debug || arg_debug_private_lib) | 250 | if (arg_debug || arg_debug_private_lib) |
250 | printf(" fslib_install_list %s\n", lib_list); | 251 | printf(" fslib_install_list %s\n", lib_list); |
251 | 252 | ||
@@ -353,7 +354,7 @@ void fs_private_lib(void) { | |||
353 | } | 354 | } |
354 | 355 | ||
355 | // for private-bin files | 356 | // for private-bin files |
356 | if (arg_private_bin) { | 357 | if (arg_private_bin && cfg.bin_private_lib && *cfg.bin_private_lib != '\0') { |
357 | if (arg_debug || arg_debug_private_lib) | 358 | if (arg_debug || arg_debug_private_lib) |
358 | printf("Processing private-bin files\n"); | 359 | printf("Processing private-bin files\n"); |
359 | fslib_install_list(cfg.bin_private_lib); | 360 | fslib_install_list(cfg.bin_private_lib); |
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index e404fbec7..e22ff7b17 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp | |||
@@ -56,6 +56,9 @@ expect { | |||
56 | "16" {puts "OK\n"} | 56 | "16" {puts "OK\n"} |
57 | "17" {puts "OK\n"} | 57 | "17" {puts "OK\n"} |
58 | "18" {puts "OK\n"} | 58 | "18" {puts "OK\n"} |
59 | "19" {puts "OK\n"} | ||
60 | "20" {puts "OK\n"} | ||
61 | "21" {puts "OK\n"} | ||
59 | } | 62 | } |
60 | after 100 | 63 | after 100 |
61 | 64 | ||