diff options
author | smitsohu <smitsohu@gmail.com> | 2022-06-08 12:12:04 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2022-06-08 12:12:04 +0200 |
commit | 27cde3d7d1e4e16d4190932347c7151dc2a84c50 (patch) | |
tree | 0da23ef1269411abd2621847e55392712b7e2cf8 /src/include | |
parent | RELNOTES: add feature/bugfix (diff) | |
download | firejail-27cde3d7d1e4e16d4190932347c7151dc2a84c50.tar.gz firejail-27cde3d7d1e4e16d4190932347c7151dc2a84c50.tar.zst firejail-27cde3d7d1e4e16d4190932347c7151dc2a84c50.zip |
fixing CVE-2022-31214
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/common.h | 3 | ||||
-rw-r--r-- | src/include/rundefs.h | 1 |
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]) { | |||
134 | 134 | ||
135 | void timetrace_start(void); | 135 | void timetrace_start(void); |
136 | float timetrace_end(void); | 136 | float timetrace_end(void); |
137 | int join_namespace(pid_t pid, char *type); | 137 | int join_namespace_by_fd(int dirfd, char *typestr); |
138 | int join_namespace(pid_t pid, char *typestr); | ||
138 | int name2pid(const char *name, pid_t *pid); | 139 | int name2pid(const char *name, pid_t *pid); |
139 | char *pid_proc_comm(const pid_t pid); | 140 | char *pid_proc_comm(const pid_t pid); |
140 | char *pid_proc_cmdline(const pid_t pid); | 141 | 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 @@ | |||
23 | // filesystem | 23 | // filesystem |
24 | #define RUN_FIREJAIL_BASEDIR "/run" | 24 | #define RUN_FIREJAIL_BASEDIR "/run" |
25 | #define RUN_FIREJAIL_DIR RUN_FIREJAIL_BASEDIR "/firejail" | 25 | #define RUN_FIREJAIL_DIR RUN_FIREJAIL_BASEDIR "/firejail" |
26 | #define RUN_FIREJAIL_SANDBOX_DIR RUN_FIREJAIL_DIR "/sandbox" | ||
26 | #define RUN_FIREJAIL_APPIMAGE_DIR RUN_FIREJAIL_DIR "/appimage" | 27 | #define RUN_FIREJAIL_APPIMAGE_DIR RUN_FIREJAIL_DIR "/appimage" |
27 | #define RUN_FIREJAIL_NAME_DIR RUN_FIREJAIL_DIR "/name" // also used in src/lib/pid.c - todo: move it in a common place | 28 | #define RUN_FIREJAIL_NAME_DIR RUN_FIREJAIL_DIR "/name" // also used in src/lib/pid.c - todo: move it in a common place |
28 | #define RUN_FIREJAIL_LIB_DIR RUN_FIREJAIL_DIR "/lib" | 29 | #define RUN_FIREJAIL_LIB_DIR RUN_FIREJAIL_DIR "/lib" |