private-lib: move from copying to mounting (#3980)

1 files changed, 20 insertions, 22 deletions

diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index d46cfed86..c69bf7c98 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -21,10 +21,8 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
-extern void fslib_duplicate(const char *full_path);
-extern void fslib_copy_libs_parse_as_user(const char *full_path);
-extern void fslib_copy_libs_parse_as_root(const char *full_path);
-extern void fslib_copy_dir(const char *full_path);
+extern void fslib_mount_libs(const char *full_path, unsigned user);
+extern void fslib_mount(const char *full_path);
 
 //***************************************************************
 // Standard C library
@@ -98,7 +96,8 @@ static void stdc(const char *dirname) {
                                 if (asprintf(&fname, "%s/%s", dirname, entry->d_name) == -1)
                                         errExit("asprintf");
 
-                                fslib_duplicate(fname);
+                                fslib_mount(fname);
+                                free(fname);
                         }
                 }
                 closedir(dir);
@@ -119,7 +118,7 @@ void fslib_install_stdc(void) {
 
         // install locale
         if (stat("/usr/lib/locale", &s) == 0)
-                fslib_copy_dir("/usr/lib/locale");
+                fslib_mount("/usr/lib/locale");
 
         fmessage("Standard C library installed in %0.2f ms\n", timetrace_end());
 }
@@ -129,7 +128,8 @@ void fslib_install_stdc(void) {
 //***************************************************************
 
 static void fdir(void) {
-        fslib_copy_dir(LIBDIR "/firejail");
+        // firejail directory itself
+        fslib_mount(LIBDIR "/firejail");
 
         // executables and libraries from firejail directory
         static const char * const fbin[] = {
@@ -143,30 +143,28 @@ static void fdir(void) {
                 NULL,
         };
 
-        // need to run fldd as root user, unprivileged users have no read permission on executables
+        // need to parse as root user, unprivileged users have no read permission on executables
         int i;
         for (i = 0; fbin[i]; i++)
-                fslib_copy_libs_parse_as_root(fbin[i]);
+                fslib_mount_libs(fbin[i], 0);
 }
 
 void fslib_install_firejail(void) {
         timetrace_start();
         // bring in firejail executable libraries, in case we are redirected here
         // by a firejail symlink from /usr/local/bin/firejail
-        fslib_copy_libs_parse_as_user(PATH_FIREJAIL);
+        fslib_mount_libs(PATH_FIREJAIL, 1); // parse as user
 
         // bring in firejail directory
         fdir();
 
         // bring in dhclient libraries
         if (any_dhcp())
-                fslib_copy_libs_parse_as_user(RUN_MNT_DIR "/dhclient");
+                fslib_mount_libs(RUN_MNT_DIR "/dhclient", 1); // parse as user
 
-#ifdef HAVE_X11
         // bring in xauth libraries
         if (arg_x11_xorg)
-                fslib_copy_libs_parse_as_user("/usr/bin/xauth");
-#endif
+                fslib_mount_libs("/usr/bin/xauth", 1); // parse as user
 
         fmessage("Firejail libraries installed in %0.2f ms\n", timetrace_end());
 }
@@ -315,8 +313,8 @@ void fslib_install_system(void) {
                         if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr->dir1) == -1)
                                 errExit("asprintf");
                         if (access(name, R_OK) == 0) {
-                                fslib_copy_libs_parse_as_user(name);
-                                fslib_copy_dir(name);
+                                fslib_mount_libs(name, 1); // parse as user
+                                fslib_mount(name);
                         }
                         else {
                                 free(name);
@@ -324,8 +322,8 @@ void fslib_install_system(void) {
                                 if (asprintf(&name, "/usr/lib64/%s", ptr->dir1) == -1)
                                         errExit("asprintf");
                                 if (access(name, R_OK) == 0) {
-                                        fslib_copy_libs_parse_as_user(name);
-                                        fslib_copy_dir(name);
+                                        fslib_mount_libs(name, 1); // parse as user
+                                        fslib_mount(name);
                                 }
                         }
                         free(name);
@@ -335,8 +333,8 @@ void fslib_install_system(void) {
                                 if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr->dir2) == -1)
                                         errExit("asprintf");
                                 if (access(name, R_OK) == 0) {
-                                        fslib_copy_libs_parse_as_user(name);
-                                        fslib_copy_dir(name);
+                                        fslib_mount_libs(name, 1); // parse as user
+                                        fslib_mount(name);
                                 }
                                 else {
                                         free(name);
@@ -344,8 +342,8 @@ void fslib_install_system(void) {
                                         if (asprintf(&name, "/usr/lib64/%s", ptr->dir2) == -1)
                                                 errExit("asprintf");
                                         if (access(name, R_OK) == 0) {
-                                                fslib_copy_libs_parse_as_user(name);
-                                                fslib_copy_dir(name);
+                                                fslib_mount_libs(name, 1); // parse as user
+                                                fslib_mount(name);
                                         }
                                 }
                                 free(name);