more errLogExit

5 files changed, 17 insertions, 30 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 2db171070..8c0b3ba4e 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -485,6 +485,7 @@ int arp_check(const char *dev, uint32_t destaddr);
 uint32_t arp_assign(const char *dev, Bridge *br);
 
 // util.c
+void errLogExit(char* fmt, ...);
 void fwarning(char* fmt, ...);
 void fmessage(char* fmt, ...);
 void drop_privs(int nogroups);
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 3e093f616..a765be1b6 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -212,7 +212,7 @@ static void whitelist_path(ProfileEntry *entry) {
                 fname = path + 5; // strlen("/tmp/")
 #ifndef TEST_MOUNTINFO
                 if (*fname == '\0')
-                        goto errexit;
+                        errLogExit("whitelisting /tmp problem");
 #endif
 
                 if (asprintf(&wfile, "%s/%s", RUN_WHITELIST_TMP_DIR, fname) == -1)
@@ -330,10 +330,8 @@ static void whitelist_path(ProfileEntry *entry) {
 
         // No mounts are allowed on top level directories. A destination such as "/etc" is very bad!
         //  - there should be more than one '/' char in dest string
-        if (mptr->dir == strrchr(mptr->dir, '/')) {
-                fprintf(stderr, "Error: invalid mount on top of %s\n", mptr->dir);
-                exit(1);
-        }
+        if (mptr->dir == strrchr(mptr->dir, '/'))
+                errLogExit("invalid whitelist mount\n");
 
         free(wfile);
         return;
@@ -884,10 +882,8 @@ void fs_whitelist(void) {
                                         // check again for files in /tmp directory
                                         if (strncmp(entry->link, "/tmp/", 5) == 0) {
                                                 char *path = realpath(entry->link, NULL);
-                                                if (path == NULL || strncmp(path, "/tmp/", 5) != 0) {
-                                                        fprintf(stderr, "Error: invalid symbolic link %s\n", entry->link);
-                                                        exit(1);
-                                                }
+                                                if (path == NULL || strncmp(path, "/tmp/", 5) != 0)
+                                                        errLogExit("invalid whitelist symlink %s\n", entry->link);
                                                 free(path);
                                         }
                                 }
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index a3ba6184f..eaaba86c0 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -178,14 +178,10 @@ void pulseaudio_init(void) {
 
                 // check /proc/self/mountinfo to confirm the mount is ok
                 MountData *mptr = get_last_mount();
-                if (strncmp(mptr->dir, homeusercfg, strlen(homeusercfg)) != 0) {
-                        fprintf(stderr, "Error: invalid mount on top of %s (should be %s)\n", mptr->dir, homeusercfg);
-                        exit(1);
-                }
-                if (strncmp(mptr->fstype, "tmpfs", 5) != 0) {
-                        fprintf(stderr, "Error: invalid mount on top of %s (filesystem type is %s)\n", mptr->dir, mptr->fstype);
-                        exit(1);
-                }
+                if (strncmp(mptr->dir, homeusercfg, strlen(homeusercfg)) != 0)
+                        errLogExit("invalid mount on top of %s (should be %s)\n", mptr->dir, homeusercfg);
+                if (strncmp(mptr->fstype, "tmpfs", 5) != 0)
+                        errLogExit("invalid mount on top of %s (filesystem type is %s)\n", mptr->dir, mptr->fstype);
 
                 char *p;
                 if (asprintf(&p, "%s/client.conf", homeusercfg) == -1)
diff --git a/src/firejail/util.c b/src/firejail/util.c
index abebe36a3..b7868a9a3 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -43,15 +43,13 @@ void errLogExit(char* fmt, ...) {
         char *msg1;
         char *msg2;
         if (vasprintf(&msg1, fmt, args) != -1 &&
-            asprintf(&msg2, "Access error: pid %d, last mount %s %s %s - %s", getuid(), m->fsname, m->dir, m->fstype, msg1) != -1)
+            asprintf(&msg2, "Access error: pid %d, last mount name:%s dir:%s type:%s - %s", getuid(), m->fsname, m->dir, m->fstype, msg1) != -1)
                 syslog(LOG_CRIT, "%s", msg2);
-        closelog();
-
-        fprintf(stderr, "Access error pid %d - ", getuid());
-        vfprintf(stderr, fmt, args);
         va_end(args);
+        closelog();
 
         sleep(2);
+        fprintf(stderr, "%s\n", msg2);
         exit(1);
 }
 
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 853bde43d..0eace3215 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1196,14 +1196,10 @@ void x11_xorg(void) {
 
         // check /proc/self/mountinfo to confirm the mount is ok
         MountData *mptr = get_last_mount();
-        if (strncmp(mptr->dir, dest, strlen(dest)) != 0) {
-                fprintf(stderr, "Error: invalid mount on top of %s (should be %s)\n", mptr->dir, dest);
-                exit(1);
-        }
-        if (strncmp(mptr->fstype, "tmpfs", 5) != 0) {
-                fprintf(stderr, "Error: invalid mount on top of %s (filesystem type is %s)\n", mptr->dir, mptr->fstype);
-                exit(1);
-        }
+        if (strncmp(mptr->dir, dest, strlen(dest)) != 0)
+                errLogExit("invalid mount on top of %s (should be %s)\n", mptr->dir, dest);
+        if (strncmp(mptr->fstype, "tmpfs", 5) != 0)
+                errLogExit("invalid mount on top of %s (filesystem type is %s)\n", mptr->dir, mptr->fstype);
         free(dest);
 #endif
 }