diff options
author | netblue30 <netblue30@protonmail.com> | 2023-03-09 15:25:45 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2023-03-09 15:25:45 -0500 |
commit | 91f2b3ffc2f4a9cff9d42482a3b0460179fdfa45 (patch) | |
tree | b03f47c878623a4aec714c60b18cac4e09786a83 /src | |
parent | make --private-lib a compile time option, disabled by default (diff) | |
download | firejail-91f2b3ffc2f4a9cff9d42482a3b0460179fdfa45.tar.gz firejail-91f2b3ffc2f4a9cff9d42482a3b0460179fdfa45.tar.zst firejail-91f2b3ffc2f4a9cff9d42482a3b0460179fdfa45.zip |
private-lib cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 1 | ||||
-rw-r--r-- | src/firejail/fs_dev.c | 1 | ||||
-rw-r--r-- | src/firejail/fs_var.c | 23 | ||||
-rw-r--r-- | src/fldd/main.c | 7 | ||||
-rw-r--r-- | src/lib/ldd_utils.c | 2 |
5 files changed, 11 insertions, 23 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 5295393f0..02315cfc2 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -606,7 +606,6 @@ void fs_var_run(void); | |||
606 | void fs_var_lock(void); | 606 | void fs_var_lock(void); |
607 | void fs_var_tmp(void); | 607 | void fs_var_tmp(void); |
608 | void fs_var_utmp(void); | 608 | void fs_var_utmp(void); |
609 | void dbg_test_dir(const char *dir); | ||
610 | 609 | ||
611 | // fs_dev.c | 610 | // fs_dev.c |
612 | void fs_dev_shm(void); | 611 | void fs_dev_shm(void); |
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c index 51a58013d..9ca73eb35 100644 --- a/src/firejail/fs_dev.c +++ b/src/firejail/fs_dev.c | |||
@@ -177,7 +177,6 @@ static void mount_dev_shm(void) { | |||
177 | int rv = mount(RUN_DEV_DIR "/shm", "/dev/shm", "none", MS_BIND, "mode=01777,gid=0"); | 177 | int rv = mount(RUN_DEV_DIR "/shm", "/dev/shm", "none", MS_BIND, "mode=01777,gid=0"); |
178 | if (rv == -1) { | 178 | if (rv == -1) { |
179 | fwarning("cannot mount the old /dev/shm in private-dev\n"); | 179 | fwarning("cannot mount the old /dev/shm in private-dev\n"); |
180 | dbg_test_dir(RUN_DEV_DIR "/shm"); | ||
181 | empty_dev_shm(); | 180 | empty_dev_shm(); |
182 | return; | 181 | return; |
183 | } | 182 | } |
diff --git a/src/firejail/fs_var.c b/src/firejail/fs_var.c index 690780a0e..4787df21e 100644 --- a/src/firejail/fs_var.c +++ b/src/firejail/fs_var.c | |||
@@ -230,21 +230,6 @@ void fs_var_cache(void) { | |||
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||
233 | void dbg_test_dir(const char *dir) { | ||
234 | if (arg_debug) { | ||
235 | if (is_dir(dir)) | ||
236 | printf("%s is a directory\n", dir); | ||
237 | if (is_link(dir)) { | ||
238 | char *lnk = realpath(dir, NULL); | ||
239 | if (lnk) { | ||
240 | printf("%s is a symbolic link to %s\n", dir, lnk); | ||
241 | free(lnk); | ||
242 | } | ||
243 | } | ||
244 | } | ||
245 | } | ||
246 | |||
247 | |||
248 | void fs_var_lock(void) { | 233 | void fs_var_lock(void) { |
249 | 234 | ||
250 | if (is_dir("/var/lock")) { | 235 | if (is_dir("/var/lock")) { |
@@ -254,10 +239,8 @@ void fs_var_lock(void) { | |||
254 | errExit("mounting /lock"); | 239 | errExit("mounting /lock"); |
255 | fs_logger("tmpfs /var/lock"); | 240 | fs_logger("tmpfs /var/lock"); |
256 | } | 241 | } |
257 | else { | 242 | else |
258 | fwarning("/var/lock not mounted\n"); | 243 | fwarning("/var/lock not mounted\n"); |
259 | dbg_test_dir("/var/lock"); | ||
260 | } | ||
261 | } | 244 | } |
262 | 245 | ||
263 | void fs_var_tmp(void) { | 246 | void fs_var_tmp(void) { |
@@ -271,10 +254,8 @@ void fs_var_tmp(void) { | |||
271 | fs_logger("tmpfs /var/tmp"); | 254 | fs_logger("tmpfs /var/tmp"); |
272 | } | 255 | } |
273 | } | 256 | } |
274 | else { | 257 | else |
275 | fwarning("/var/tmp not mounted\n"); | 258 | fwarning("/var/tmp not mounted\n"); |
276 | dbg_test_dir("/var/tmp"); | ||
277 | } | ||
278 | } | 259 | } |
279 | 260 | ||
280 | void fs_var_utmp(void) { | 261 | void fs_var_utmp(void) { |
diff --git a/src/fldd/main.c b/src/fldd/main.c index 4b645b1b3..63398ce2e 100644 --- a/src/fldd/main.c +++ b/src/fldd/main.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include "../include/common.h" | 21 | #include "../include/common.h" |
22 | #include "../include/ldd_utils.h" | 22 | #include "../include/ldd_utils.h" |
23 | #ifdef HAVE_PRIVATE_LIB | ||
23 | 24 | ||
24 | #include <fcntl.h> | 25 | #include <fcntl.h> |
25 | #include <sys/mman.h> | 26 | #include <sys/mman.h> |
@@ -357,3 +358,9 @@ printf("\n"); | |||
357 | close(fd); | 358 | close(fd); |
358 | return 0; | 359 | return 0; |
359 | } | 360 | } |
361 | #else | ||
362 | int main(void) { | ||
363 | printf("Sorry, private lib is disabled in this build\n"); | ||
364 | return 0; | ||
365 | } | ||
366 | #endif \ No newline at end of file | ||
diff --git a/src/lib/ldd_utils.c b/src/lib/ldd_utils.c index 39a548887..80e3b92d7 100644 --- a/src/lib/ldd_utils.c +++ b/src/lib/ldd_utils.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <sys/stat.h> | 23 | #include <sys/stat.h> |
24 | #include <fcntl.h> | 24 | #include <fcntl.h> |
25 | 25 | ||
26 | #ifdef HAVE_PRIVATE_LIB | ||
26 | // todo: resolve overlap with masked_lib_dirs[] array from fs_lib.c | 27 | // todo: resolve overlap with masked_lib_dirs[] array from fs_lib.c |
27 | const char * const default_lib_paths[] = { | 28 | const char * const default_lib_paths[] = { |
28 | "/usr/lib/x86_64-linux-gnu", // Debian & friends | 29 | "/usr/lib/x86_64-linux-gnu", // Debian & friends |
@@ -63,3 +64,4 @@ doexit: | |||
63 | close(fd); | 64 | close(fd); |
64 | return retval; | 65 | return retval; |
65 | } | 66 | } |
67 | #endif \ No newline at end of file | ||