CVE-2022-31214: fixing the fix

2 files changed, 5 insertions, 5 deletions

diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index deaee31bb..e87d3b726 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -104,7 +104,7 @@ static void build_dirs(char *src, char *dst, size_t src_prefix_len, size_t dst_p
                                 *q = '\0';
                                 *r = '/';
                                 r = q;
-                                create_empty_dir_as_root(dst, s.st_mode);
+                                mkdir_attr(dst, s.st_mode, 0, 0);
                         }
                         if (!last) {
                                 // If we're not at the final terminating null, restore
@@ -330,9 +330,9 @@ void fs_rebuild_etc(void) {
                                 symlink_done = 1;
                 }
                 else if (S_ISDIR(s.st_mode))
-                        create_empty_dir_as_root(dest, s.st_mode);
+                        create_empty_dir_as_root(dest, S_IRWXU);
                 else
-                        create_empty_file_as_root(dest, s.st_mode);
+                        create_empty_file_as_root(dest, S_IRUSR | S_IWUSR);
 
                 // bind-mount src on top of dest
                 if (!symlink_done) {
diff --git a/src/firejail/process.c b/src/firejail/process.c
index 5adb4f8cc..fa6b1394d 100644
--- a/src/firejail/process.c
+++ b/src/firejail/process.c
@@ -96,7 +96,7 @@ int process_stat_nofail(ProcessHandle process, const char *fname, struct stat *s
 int process_stat(ProcessHandle process, const char *fname, struct stat *s) {
         int rv = process_stat_nofail(process, fname, s);
         if (rv) {
-                fprintf(stderr, "Error: cannot stat /proc/%d/%s: %s\n", process->pid, fname, strerror(errno));
+                fprintf(stderr, "Error: cannot stat /proc/%d/%s: %s\n", process_get_pid(process), fname, strerror(errno));
                 exit(1);
         }
 
@@ -117,7 +117,7 @@ int process_open_nofail(ProcessHandle process, const char *fname) {
 int process_open(ProcessHandle process, const char *fname) {
         int rv = process_open_nofail(process, fname);
         if (rv < 0) {
-                fprintf(stderr, "Error: cannot open /proc/%d/%s: %s\n", process->pid, fname, strerror(errno));
+                fprintf(stderr, "Error: cannot open /proc/%d/%s: %s\n", process_get_pid(process), fname, strerror(errno));
                 exit(1);
         }