1 files changed, 5 insertions, 0 deletions

diff --git a/src/firejail/join.c b/src/firejail/join.c
index c303d3fb8..d4a2389c6 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -292,6 +292,8 @@ void join(pid_t pid, int argc, char **argv, int index) {
                 }
 
                 prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
+
+                EUID_USER();
                 if (chdir("/") < 0)
                         errExit("chdir");
                 if (homedir) {
@@ -308,6 +310,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
                         set_cpu_affinity();
 
                 // set caps filter
+                EUID_ROOT();
                 if (apply_caps == 1)    // not available for uid 0
                         caps_set(caps);
 #ifdef HAVE_SECCOMP
@@ -347,6 +350,8 @@ void join(pid_t pid, int argc, char **argv, int index) {
                 }
 
                 // set environment, add x11 display
+                EUID_USER();
+
                 env_defaults();
                 if (display) {
                         char *display_str;