grsecurity: fs.print

3 files changed, 34 insertions, 0 deletions

diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index 227a66cd7..30b0fe438 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -141,7 +141,9 @@ void fs_logger_print_log(pid_t pid) {
         EUID_ASSERT();
 
         // if the pid is that of a firejail  process, use the pid of the first child process
+        EUID_ROOT();
         char *comm = pid_proc_comm(pid);
+        EUID_USER();
         if (comm) {
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
diff --git a/test/fs-print.exp b/test/fs-print.exp
new file mode 100755
index 000000000..48056a3bf
--- /dev/null
+++ b/test/fs-print.exp
@@ -0,0 +1,29 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --name=test\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 2
+
+spawn $env(SHELL)
+send -- "firejail --fs.print=test\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "blacklist /boot"
+}
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "blacklist /dev/kmsg"
+}
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "blacklist /proc/kmsg"
+}
+sleep 1
+puts "\nall done\n"
diff --git a/test/test.sh b/test/test.sh
index c8720044a..417d41810 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -6,6 +6,9 @@
 
 ./fscheck.sh
 
+echo "TESTING: fs.print (fs-print.exp)"
+./fs-print.exp
+
 echo "TESTING: caps.print (caps-print.exp)"
 ./caps-print.exp