modif: improve error messages in mountinfo.c

Relates to #6450.

Author: kmk3

src/firejail/mountinfo.c

@@ -107,8 +107,12 @@ static void parse_line(char *line, MountData *output) {
 	if (output->mountid < 0 ||
 	    output->fsname == NULL ||
 	    output->dir == NULL ||
-	    output->fstype == NULL)
-		goto errexit;
+	    output->fstype == NULL) {
+		fprintf(stderr, "Error: invalid MountData from line: '%s': mountid=%d fsname=%s dir=%s fstype=%s\n",
+		        line, output->mountid, output->fsname, output->dir,
+		        output->fstype);
+		exit(1);
+	}
 
 	// restore empty spaces
 	unmangle_path(output->fsname);
@@ -117,7 +121,7 @@ static void parse_line(char *line, MountData *output) {
 	return;
 
 errexit:
-	fprintf(stderr, "Error: cannot read /proc/self/mountinfo\n");
+	fprintf(stderr, "Error: cannot parse line from /proc/self/mountinfo: '%s'\n", line);
 	exit(1);
 }
 
@@ -127,7 +131,7 @@ MountData *get_last_mount(void) {
 	FILE *fp = fopen("/proc/self/mountinfo", "re");
 	if (!fp) {
 		fprintf(stderr, "Error: cannot read /proc/self/mountinfo\n");
-		exit(1);
+		errExit("fopen");
 	}
 
 	mbuf[0] = '\0';
@@ -158,8 +162,8 @@ static int get_mount_id_from_handle(int fd) {
 	int rv = -1;
 	int tmp;
 	if (name_to_handle_at(-1, proc, fh, &tmp, AT_SYMLINK_FOLLOW) != -1) {
-		fprintf(stderr, "Error: unexpected result from name_to_handle_at\n");
-		exit(1);
+		fprintf(stderr, "Error: unexpected result from name_to_handle_at for fd %d\n", fd);
+		errExit("name_to_handle_at");
 	}
 	if (errno == EOVERFLOW && fh->handle_bytes)
 		rv = tmp;
@@ -184,8 +188,8 @@ static int get_mount_id_from_fdinfo(int fd) {
 
 	FILE *fp = fopen(proc, "re");
 	if (!fp) {
-		fprintf(stderr, "Error: cannot read proc file\n");
-		exit(1);
+		fprintf(stderr, "Error: cannot read %s\n", proc);
+		errExit("fopen");
 	}
 
 	if (called_as_root == 0)
@@ -218,7 +222,7 @@ char **build_mount_array(const int mountid, const char *path) {
 	FILE *fp = fopen("/proc/self/mountinfo", "re");
 	if (!fp) {
 		fprintf(stderr, "Error: cannot read /proc/self/mountinfo\n");
-		exit(1);
+		errExit("fopen");
 	}
 
 	// try to find line with mount id