Skip to content

Commit

Permalink
private-lib: move from copying to mounting (netblue30#3980)
Browse files Browse the repository at this point in the history
  • Loading branch information
@smitsohu
smitsohu committed Mar 4, 2021
1 parent 214da2d commit 5c08700
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 146 deletions.
214 changes: 91 additions & 123 deletions src/firejail/fs_lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
#include <glob.h>
#define MAXBUF 4096

Expand Down Expand Up @@ -105,80 +106,114 @@ char *find_in_path(const char *program) {
return NULL;
}

static void report_duplication(const char *full_path) {
char *fname = strrchr(full_path, '/');
if (fname && *(++fname) != '\0') {
// report the file on all bin paths
int i = 0;
while (default_lib_paths[i]) {
char *p;
if (asprintf(&p, "%s/%s", default_lib_paths[i], fname) == -1)
errExit("asprintf");
fs_logger2("clone", p);
free(p);
i++;
}
}
}

static char *build_dest_dir(const char *full_path) {
assert(full_path);
if (strstr(full_path, "/x86_64-linux-gnu/"))
return RUN_LIB_DIR "/x86_64-linux-gnu";
return RUN_LIB_DIR;
}

// copy fname in private_run_dir
void fslib_duplicate(const char *full_path) {
// return name of mount target in allocated memory
static char *build_dest_name(const char *full_path) {
assert(full_path);
char *fname = strrchr(full_path, '/');
assert(fname);
fname++;
assert(*fname != '\0');

struct stat s;
if (stat(full_path, &s) != 0 || s.st_uid != 0 || access(full_path, R_OK)
|| !valid_full_path(full_path))
return;
char *dest;
if (asprintf(&dest, "%s/%s", build_dest_dir(full_path), fname) == -1)
errExit("asprintf");
return dest;
}

char *dest_dir = build_dest_dir(full_path);
static void fslib_mount_dir(const char *src) {
// create new directory and mount the original on top of it
char *dest = build_dest_name(src);
if (mkdir(dest, 0755) == -1) {
if (errno == EEXIST) { // directory has been mounted already, nothing to do
free(dest);
return;
}
errExit("mkdir");
}

// don't copy it if the file is already there
char *ptr = strrchr(full_path, '/');
if (!ptr)
return;
ptr++;
if (*ptr == '\0')
return;
if (arg_debug || arg_debug_private_lib)
printf(" mounting %s on %s\n", src, dest);
// if src is a symbolic link, mount will follow it
if (mount(src, dest, NULL, MS_BIND|MS_REC, NULL) < 0)
errExit("mount bind");
free(dest);
dir_cnt++;
}

char *name;
if (asprintf(&name, "%s/%s", dest_dir, ptr) == -1)
errExit("asprintf");
if (stat(name, &s) == 0) {
free(name);
return;
static void fslib_mount_file(const char *src) {
// create new file and mount the original on top of it
char *dest = build_dest_name(src);
int fd = open(dest, O_RDONLY|O_CREAT|O_EXCL|O_CLOEXEC, S_IRUSR | S_IWUSR);
if (fd == -1) {
if (errno == EEXIST) { // file has been mounted already, nothing to do
free(dest);
return;
}
errExit("open");
}
free(name);
close(fd);

if (arg_debug || arg_debug_private_lib)
printf(" copying %s to private %s\n", full_path, dest_dir);

sbox_run(SBOX_ROOT| SBOX_SECCOMP, 4, PATH_FCOPY, "--follow-link", full_path, dest_dir);
report_duplication(full_path);
printf(" mounting %s on %s\n", src, dest);
// if src is a symbolic link, mount will follow it
if (mount(src, dest, NULL, MS_BIND, NULL) < 0)
errExit("mount bind");
free(dest);
lib_cnt++;
}

void fslib_mount(const char *full_path) {
assert(full_path);
struct stat s;

if (!valid_full_path(full_path) ||
access(full_path, F_OK) != 0 ||
stat(full_path, &s) != 0 ||
s.st_uid != 0)
return;

if (S_ISREG(s.st_mode) && is_lib_64(full_path))
fslib_mount_file(full_path);
else if (S_ISDIR(s.st_mode))
fslib_mount_dir(full_path);
}

// requires full path for lib
// it could be a library or an executable
// lib is not copied, only libraries used by it
static void fslib_copy_libs(const char *full_path, unsigned mask) {
void fslib_mount_libs(const char *full_path, unsigned user) {
assert(full_path);
// if library/executable does not exist or the user does not have read access to it
// print a warning and exit the function.
if (user && access(full_path, R_OK)) {
if (arg_debug || arg_debug_private_lib)
printf("Cannot read %s, skipping...\n", full_path);
return;
}

if (arg_debug || arg_debug_private_lib)
printf(" fslib_mount_libs %s (parse as %s)\n", full_path, user ? "user" : "root");
// create an empty RUN_LIB_FILE and allow the user to write to it
unlink(RUN_LIB_FILE); // in case is there
create_empty_file_as_root(RUN_LIB_FILE, 0644);
if (mask & SBOX_USER) {
if (chown(RUN_LIB_FILE, getuid(), getgid()))
errExit("chown");
}
if (user && chown(RUN_LIB_FILE, getuid(), getgid()))
errExit("chown");

// run fldd to extract the list of files
if (arg_debug || arg_debug_private_lib)
printf(" running fldd %s\n", full_path);
unsigned mask;
if (user)
mask = SBOX_USER;
else
mask = SBOX_ROOT;
sbox_run(mask | SBOX_SECCOMP | SBOX_CAPS_NONE, 3, PATH_FLDD, full_path, RUN_LIB_FILE);

// open the list of libraries and install them on by one
Expand All @@ -192,96 +227,31 @@ static void fslib_copy_libs(const char *full_path, unsigned mask) {
char *ptr = strchr(buf, '\n');
if (ptr)
*ptr = '\0';
fslib_duplicate(buf);

fslib_mount(buf);
}
fclose(fp);
unlink(RUN_LIB_FILE);
}

void fslib_copy_libs_parse_as_root(const char *full_path) {
assert(full_path);
if (arg_debug || arg_debug_private_lib)
printf(" fslib_copy_libs_parse_as_root %s\n", full_path);

struct stat s;
if (stat(full_path, &s)) {
if (arg_debug || arg_debug_private_lib)
printf("cannot find %s for private-lib, skipping...\n", full_path);
return;
}
fslib_copy_libs(full_path, SBOX_ROOT);
}

// if library/executable does not exist or the user does not have read access to it
// print a warning and exit the function.
void fslib_copy_libs_parse_as_user(const char *full_path) {
assert(full_path);
if (arg_debug || arg_debug_private_lib)
printf(" fslib_copy_libs_parse_as_user %s\n", full_path);

if (access(full_path, R_OK)) {
if (arg_debug || arg_debug_private_lib)
printf("cannot find %s for private-lib, skipping...\n", full_path);
return;
}
fslib_copy_libs(full_path, SBOX_USER);
}

void fslib_copy_dir(const char *full_path) {
assert(full_path);
if (arg_debug || arg_debug_private_lib)
printf(" fslib_copy_dir %s\n", full_path);

// do nothing if the directory does not exist or is not owned by root
struct stat s;
if (stat(full_path, &s) != 0 || s.st_uid != 0 || !S_ISDIR(s.st_mode) || access(full_path, R_OK)
|| !valid_full_path(full_path))
return;

char *dir_name = strrchr(full_path, '/');
assert(dir_name);
dir_name++;
assert(*dir_name != '\0');

// do nothing if the directory is already there
char *dest;
if (asprintf(&dest, "%s/%s", build_dest_dir(full_path), dir_name) == -1)
errExit("asprintf");
if (stat(dest, &s) == 0) {
free(dest);
return;
}

// create new directory and mount the original on top of it
mkdir_attr(dest, 0755, 0, 0);

if (mount(full_path, dest, NULL, MS_BIND|MS_REC, NULL) < 0 ||
mount(NULL, dest, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV|MS_REC, NULL) < 0)
errExit("mount bind");
fs_logger2("clone", full_path);
fs_logger2("mount", full_path);
dir_cnt++;
free(dest);
}

// fname should be a vallid full path at this point
static void load_library(const char *fname) {
assert(fname);
assert(*fname == '/');

// existing file owned by root, read access
// existing file owned by root
struct stat s;
if (stat(fname, &s) == 0 && s.st_uid == 0 && !access(fname, R_OK)) {
if (!access(fname, F_OK) && stat(fname, &s) == 0 && s.st_uid == 0) {
// load directories, regular 64 bit libraries, and 64 bit executables
if (is_dir(fname) || is_lib_64(fname)) {
if (is_dir(fname))
fslib_copy_dir(fname);
if (S_ISDIR(s.st_mode) || is_lib_64(fname)) {
if (S_ISDIR(s.st_mode))
fslib_mount(fname);
else {
if (strstr(fname, ".so") ||
access(fname, X_OK) != 0) // don't duplicate executables, just install the libraries
fslib_duplicate(fname);
fslib_mount(fname);

fslib_copy_libs_parse_as_user(fname);
fslib_mount_libs(fname, 1); // parse as user
}
}
}
Expand Down Expand Up @@ -338,7 +308,6 @@ static void install_list_entry(const char *lib) {
return;
}


void fslib_install_list(const char *lib_list) {
assert(lib_list);
if (arg_debug || arg_debug_private_lib)
Expand Down Expand Up @@ -444,7 +413,6 @@ void fs_private_lib(void) {
fslib_install_list(cfg.shell);
// a shell is useless without some basic commands
fslib_install_list("/bin/ls,/bin/cat,/bin/mv,/bin/rm");

}

// for the listed libs and directories
Expand Down
Loading

0 comments on commit 5c08700

Please sign in to comment.