get error handling right

2 files changed, 10 insertions, 3 deletions

diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index a7a1c3acc..a3ba6184f 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -178,10 +178,14 @@ void pulseaudio_init(void) {
 
                 // check /proc/self/mountinfo to confirm the mount is ok
                 MountData *mptr = get_last_mount();
-                if (strncmp(mptr->fstype, "tmpfs", 5) != 0 || strncmp(mptr->dir, homeusercfg, strlen(homeusercfg)) != 0) {
+                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);
+                }
 
                 char *p;
                 if (asprintf(&p, "%s/client.conf", homeusercfg) == -1)
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 554035c60..853bde43d 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1196,11 +1196,14 @@ void x11_xorg(void) {
 
         // check /proc/self/mountinfo to confirm the mount is ok
         MountData *mptr = get_last_mount();
-        if (strncmp(mptr->fstype, "tmpfs", 5) != 0 || strncmp(mptr->dir, dest, strlen(dest)) != 0) {
+        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);
+        }
         free(dest);
 #endif
 }