Fix tracing with private-lib

2 files changed, 12 insertions, 2 deletions

diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index cc60a330f..19e900a4b 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -185,6 +185,12 @@ void fs_private_lib(void) {
                 fs_logger_print();
         }
 
+        // for our trace and tracelog libs
+        if (arg_trace)
+                duplicate(LIBDIR "/firejail/libtrace.so", RUN_LIB_DIR);
+        else if (arg_tracelog)
+                duplicate(LIBDIR "/firejail/libtracelog.so", RUN_LIB_DIR);
+
         if (arg_debug)
                 printf("Mount-bind %s on top of /lib /lib64 /usr/lib\n", RUN_LIB_DIR);
         if (mount(RUN_LIB_DIR, "/lib", NULL, MS_BIND|MS_REC, NULL) < 0 ||
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index f964c05d0..df76f4fe1 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -51,11 +51,15 @@ void fs_trace(void) {
         FILE *fp = fopen(RUN_LDPRELOAD_FILE, "w");
         if (!fp)
                 errExit("fopen");
+        const char *prefix = LIBDIR "/firejail";
+        if (arg_private_lib)
+                prefix = RUN_LIB_DIR;
+
         if (arg_trace) {
-                fprintf(fp, "%s/firejail/libtrace.so\n", LIBDIR);
+                fprintf(fp, "%s/libtrace.so\n", prefix);
         }
         else if (arg_tracelog) {
-                fprintf(fp, "%s/firejail/libtracelog.so\n", LIBDIR);
+                fprintf(fp, "%s/libtracelog.so\n", prefix);
                 if (!arg_quiet)
                         printf("Blacklist violations are logged to syslog\n");
         }