fixing CVE-2022-31214

2 files changed, 3 insertions, 1 deletions

diff --git a/src/include/common.h b/src/include/common.h
index c9640435a..ed6560701 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -134,7 +134,8 @@ static inline int mac_not_zero(const unsigned char mac[6]) {
 
 void timetrace_start(void);
 float timetrace_end(void);
-int join_namespace(pid_t pid, char *type);
+int join_namespace_by_fd(int dirfd, char *typestr);
+int join_namespace(pid_t pid, char *typestr);
 int name2pid(const char *name, pid_t *pid);
 char *pid_proc_comm(const pid_t pid);
 char *pid_proc_cmdline(const pid_t pid);
diff --git a/src/include/rundefs.h b/src/include/rundefs.h
index 4ba3e27f4..2f6b47461 100644
--- a/src/include/rundefs.h
+++ b/src/include/rundefs.h
@@ -23,6 +23,7 @@
 // filesystem
 #define RUN_FIREJAIL_BASEDIR            "/run"
 #define RUN_FIREJAIL_DIR                RUN_FIREJAIL_BASEDIR "/firejail"
+#define RUN_FIREJAIL_SANDBOX_DIR        RUN_FIREJAIL_DIR "/sandbox"
 #define RUN_FIREJAIL_APPIMAGE_DIR       RUN_FIREJAIL_DIR "/appimage"
 #define RUN_FIREJAIL_NAME_DIR           RUN_FIREJAIL_DIR "/name" // also used in src/lib/pid.c - todo: move it in a common place
 #define RUN_FIREJAIL_LIB_DIR            RUN_FIREJAIL_DIR "/lib"