From db80836b03d697f3788f48ea59f6093021e2a521 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 15 Jul 2018 07:29:30 -0400 Subject: fix private-lib crash --- src/firejail/fs_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { void fslib_install_list(const char *lib_list) { + assert(lib_list); if (arg_debug || arg_debug_private_lib) printf(" fslib_install_list %s\n", lib_list); @@ -353,7 +354,7 @@ void fs_private_lib(void) { } // for private-bin files - if (arg_private_bin) { + if (arg_private_bin && cfg.bin_private_lib && *cfg.bin_private_lib != '\0') { if (arg_debug || arg_debug_private_lib) printf("Processing private-bin files\n"); fslib_install_list(cfg.bin_private_lib); -- cgit v1.2.3-54-g00ecf From a5fac8b64c4bef1fd46f1a7e019b9729216ead9e Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 15 Jul 2018 09:40:22 -0400 Subject: testing --- test/fs/whitelist-dev.exp | 3 +++ 1 file changed, 3 insertions(+) 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 { "16" {puts "OK\n"} "17" {puts "OK\n"} "18" {puts "OK\n"} + "19" {puts "OK\n"} + "20" {puts "OK\n"} + "21" {puts "OK\n"} } after 100 -- cgit v1.2.3-54-g00ecf From 2c7b638885f21444dbf46fe8d7598f68137d2879 Mon Sep 17 00:00:00 2001 From: ಚಿರಾಗ್ ನಟರಾಜ್ Date: Sun, 15 Jul 2018 15:52:21 -0400 Subject: Fix indentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12ff8df21..46bd892d6 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe Example: $ firejail --keep-dev-shm --private-dev - --nou2f + --nou2f Disable U2F devices. Example: -- cgit v1.2.3-54-g00ecf From e24feb56d88343c45c322ad340b0c4ca6dec17ef Mon Sep 17 00:00:00 2001 From: ಚಿರಾಗ್ ನಟರಾಜ್ Date: Sun, 15 Jul 2018 15:53:22 -0400 Subject: Fix indentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46bd892d6..b6e3026c0 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe Example: $ firejail --nou2f - --private-cache + --private-cache Mount an empty temporary filesystem on top of the .cache directory in user home. All modifications are discarded when the sandbox is closed. -- cgit v1.2.3-54-g00ecf