From 70f2cd167f9080563224b035d04bc568b16c4b6c Mon Sep 17 00:00:00 2001 From: smitsohu Date: Sun, 6 Feb 2022 01:51:59 +0100 Subject: fix joining of sandboxes without shell regressed in c764520b5aa343c00c3a73633511df039645973c --- src/firejail/join.c | 5 +++++ 1 file changed, 5 insertions(+) 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) { fprintf(stderr, "Error: cannot open shell %s\n", cfg.shell); exit(1); } + + // pass file descriptor through to the final fexecve + if (asprintf(&cfg.keep_fd, "%s,%d", cfg.keep_fd ? cfg.keep_fd : "", fd) == -1) + errExit("asprintf"); + return fd; } -- cgit v1.2.3-70-g09d2