github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

fix broken tests and regression on 45304621a6

Browse source
This commit is contained in:
smitsohu 2021-01-06 13:14:22 +01:00
parent 18e806cf60
commit 1e3891ed00
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/firejail/fs_lib.c
View file

@ -336,6 +336,12 @@ void fs_private_lib(void) {
// start timetrace
timetrace_start();
// bring in firejail executable libraries in case we are redirected here by a firejail symlink from /usr/local/bin/firejail
fslib_install_list(PATH_FIREJAIL);
// bring in firejail directory
fslib_install_list("firejail");
// copy the libs in the new lib directory for the main exe
if (cfg.original_program_index > 0) {
if (arg_debug || arg_debug_private_lib)
@ -374,13 +380,6 @@ void fs_private_lib(void) {
printf("Installing system libraries\n");
fslib_install_system();
// bring in firejail directory for --trace and seccomp post exec
// bring in firejail executable libraries in case we are redirected here by a firejail symlink from /usr/local/bin/firejail
fslib_install_list("/usr/bin/firejail,firejail"); // todo: use the installed path for the executable
// install libraries needed by fcopy
fslib_install_list(PATH_FCOPY);
fmessage("Installed %d %s and %d %s\n", lib_cnt, (lib_cnt == 1)? "library": "libraries",
dir_cnt, (dir_cnt == 1)? "directory": "directories");

7
src/firejail/fs_lib2.c
View file

@ -30,6 +30,7 @@ extern void fslib_copy_dir(const char *full_path);
//***************************************************************
// standard libc libraries based on Debian's libc6 package
// selinux seems to be linked in most command line utilities
// libpcre2 is a dependency of selinux
// locale (/usr/lib/locale) - without it, the program will default to "C" locale
typedef struct liblist_t {
const char *name;
@ -38,6 +39,7 @@ typedef struct liblist_t {
static LibList libc_list[] = {
{ "libselinux.so.", 0 },
{ "libpcre2-8.so.", 0 },
{ "libapparmor.so.", 0},
{ "ld-linux-x86-64.so.", 0 },
{ "libanl.so.", 0 },
@ -104,16 +106,19 @@ static void stdc(const char *dirname) {
void fslib_install_stdc(void) {
// install standard C libraries
timetrace_start();
struct stat s;
char *stdclib = "/lib64"; // CentOS, Fedora, Arch
if (stat("/lib/x86_64-linux-gnu", &s) == 0) { // Debian & friends
// PT_INTERP
fslib_duplicate("/lib64/ld-linux-x86-64.so.2");
mkdir_attr(RUN_LIB_DIR "/x86_64-linux-gnu", 0755, 0, 0);
selinux_relabel_path(RUN_LIB_DIR "/x86_64-linux-gnu", "/lib/x86_64-linux-gnu");
stdclib = "/lib/x86_64-linux-gnu";
}
timetrace_start();
stdc(stdclib);
// install locale