github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

firejail-in-firejail fixes

Browse source
This commit is contained in:
netblue30 2015-08-28 07:23:19 -04:00
parent ce8729c360
commit f5b9be2a61
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/firejail/bandwidth.c
View file

@ -125,8 +125,10 @@ void shm_create_firejail_dir(void) {
}
else { // check /dev/shm/firejail directory belongs to root end exit if doesn't!
if (s.st_uid != 0 || s.st_gid != 0) {
fprintf(stderr, "Error: non-root %s directory, exiting...\n", "/dev/shm/firejail");
exit(1);
if (firejail_in_firejail == 0) {
fprintf(stderr, "Error: non-root %s directory, exiting...\n", "/dev/shm/firejail");
exit(1);
}
}
}
}

1
src/firejail/firejail.h
View file

@ -151,6 +151,7 @@ extern int arg_scan; // arp-scan all interfaces
extern int parent_to_child_fds[2];
extern int child_to_parent_fds[2];
extern pid_t sandbox_pid;
extern int firejail_in_firejail;

6
src/firejail/fs.c
View file

@ -44,8 +44,10 @@ void fs_build_firejail_dir(void) {
}
else { // check /tmp/firejail directory belongs to root end exit if doesn't!
if (s.st_uid != 0 || s.st_gid != 0) {
fprintf(stderr, "Error: non-root %s directory, exiting...\n", FIREJAIL_DIR);
exit(1);
if (firejail_in_firejail == 0) {
fprintf(stderr, "Error: non-root %s directory, exiting...\n", FIREJAIL_DIR);
exit(1);
}
}
}
}

18
src/firejail/main.c
View file

@ -92,6 +92,7 @@ char *fullargv[MAX_ARGS]; // expanded argv for restricted shell
int fullargc = 0;
static pid_t child = 0;
pid_t sandbox_pid;
int firejail_in_firejail = 0; // firejail started in a firejail sandbox
static void myexit(int rv) {
logmsg("exiting...");
@ -127,8 +128,10 @@ static void my_handler(int s){
static void extract_user_data(void) {
// check suid
if (geteuid()) {
fprintf(stderr, "Error: the sandbox is not setuid root\n");
exit(1);
if (firejail_in_firejail == 0) {
fprintf(stderr, "Error: the sandbox is not setuid root\n");
exit(1);
}
}
struct passwd *pw = getpwuid(getuid());
@ -400,6 +403,14 @@ int main(int argc, char **argv) {
int arg_cgroup = 0;
int custom_profile = 0; // custom profile loaded
int arg_noprofile = 0; // use generic.profile if none other found/specified
// check if we already have a sandbox running
int rv = check_kernel_procs();
if (rv == 0)
firejail_in_firejail = 1;
// initialize globals
init_cfg();
@ -998,8 +1009,7 @@ int main(int argc, char **argv) {
}
// if a sandbox is already running, start the program directly without sandboxing
int rv = check_kernel_procs();
if (rv == 0) {
if (firejail_in_firejail) {
run_no_sandbox(argc, argv);
// it will never get here!
assert(0);