aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2022-02-06 01:51:59 +0100
committerLibravatar smitsohu <smitsohu@gmail.com>2022-02-06 01:58:22 +0100
commit70f2cd167f9080563224b035d04bc568b16c4b6c (patch)
tree4f30eccb445d71956a0d33e03c7fc92754087a92
parentRELNOTES: add bugfix for symlinks on private-bin + globs (diff)
downloadfirejail-70f2cd167f9080563224b035d04bc568b16c4b6c.tar.gz
firejail-70f2cd167f9080563224b035d04bc568b16c4b6c.tar.zst
firejail-70f2cd167f9080563224b035d04bc568b16c4b6c.zip
fix joining of sandboxes without shell
-rw-r--r--src/firejail/join.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/firejail/join.c b/src/firejail/join.c
index b62a1ca9d..5d73f71be 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -315,6 +315,11 @@ static int open_shell(void) {
315 fprintf(stderr, "Error: cannot open shell %s\n", cfg.shell); 315 fprintf(stderr, "Error: cannot open shell %s\n", cfg.shell);
316 exit(1); 316 exit(1);
317 } 317 }
318
319 // pass file descriptor through to the final fexecve
320 if (asprintf(&cfg.keep_fd, "%s,%d", cfg.keep_fd ? cfg.keep_fd : "", fd) == -1)
321 errExit("asprintf");
322
318 return fd; 323 return fd;
319} 324}
320 325