diff options
author | 2021-03-05 10:56:46 -0500 | |
---|---|---|
committer | 2021-03-05 10:56:46 -0500 | |
commit | ee1d3ca15343fa8f60d34669184b0460034203b4 (patch) | |
tree | 7fffb3c6a9237e98ee454736c244e6623e3bfead /src | |
parent | Merge pull request #4040 from smitsohu/logger (diff) | |
parent | sandbox setup: postpone library preloading (diff) | |
download | firejail-ee1d3ca15343fa8f60d34669184b0460034203b4.tar.gz firejail-ee1d3ca15343fa8f60d34669184b0460034203b4.tar.zst firejail-ee1d3ca15343fa8f60d34669184b0460034203b4.zip |
Merge pull request #4041 from smitsohu/trace
sandbox setup: postpone library preloading
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/sandbox.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 88490033d..36a54d6fe 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -1029,12 +1029,6 @@ int sandbox(void* sandbox_arg) { | |||
1029 | fs_dev_disable_video(); | 1029 | fs_dev_disable_video(); |
1030 | 1030 | ||
1031 | //**************************** | 1031 | //**************************** |
1032 | // install trace | ||
1033 | //**************************** | ||
1034 | if (need_preload) | ||
1035 | fs_trace(); | ||
1036 | |||
1037 | //**************************** | ||
1038 | // set dns | 1032 | // set dns |
1039 | //**************************** | 1033 | //**************************** |
1040 | fs_resolvconf(); | 1034 | fs_resolvconf(); |
@@ -1150,6 +1144,16 @@ int sandbox(void* sandbox_arg) { | |||
1150 | fs_remount(RUN_SECCOMP_DIR, MOUNT_READONLY, 0); | 1144 | fs_remount(RUN_SECCOMP_DIR, MOUNT_READONLY, 0); |
1151 | seccomp_debug(); | 1145 | seccomp_debug(); |
1152 | 1146 | ||
1147 | //**************************** | ||
1148 | // install trace - still need capabilities | ||
1149 | //**************************** | ||
1150 | if (need_preload) | ||
1151 | fs_trace(); | ||
1152 | |||
1153 | //**************************** | ||
1154 | // continue security filters | ||
1155 | //**************************** | ||
1156 | |||
1153 | // set capabilities | 1157 | // set capabilities |
1154 | set_caps(); | 1158 | set_caps(); |
1155 | 1159 | ||