From: Karel Zak <kzak@redhat.com>
Date: Thu, 29 Sep 2016 09:55:07 +0000 (+0200)
Subject: libmount: paranoid change in mnt_table_is_fs_mounted()
X-Git-Tag: v2.29-rc1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e44e75dae38cce3423cf5270c5edfd1079ca438;p=thirdparty%2Futil-linux.git

libmount: paranoid change in mnt_table_is_fs_mounted()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index 9c49ec885b..f72dcf1c2e 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1577,7 +1577,9 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
 		}
 
 		if (root) {
-			if (strcmp(mnt_fs_get_fstype(fs), "cifs") == 0) {
+			const char *fstype = mnt_fs_get_fstype(fs);
+
+			if (fstype && strcmp(fstype, "cifs") == 0) {
 				const char *unc_subdir = get_cifs_unc_subdir_path(src);
 				const char *path_on_fs = mnt_fs_get_root(fs);
 				if (!unc_subdir || !path_on_fs || !streq_paths(unc_subdir, path_on_fs))