libmount: segfaults if neither /etc/filesystems nor/proc/filesystems exists

Reported-by: Juergen Daubert <jue@jue.li>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index f3d8ff103b0153a4f0f96005eef63dcce1a778c2..fdb459c32350f76e1437724e4d993bf1078c3785 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -587,6 +587,9 @@ static int do_mount_by_pattern(struct libmnt_context *cxt, const char *pattern)
        if (rc)
                return rc;
 
+       if (filesystems == NULL)
+               return -MNT_ERR_NOFSTYPE;
+
        for (fp = filesystems; *fp; fp++) {
                rc = do_mount(cxt, *fp);
                if (mnt_context_get_status(cxt))

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 245a3b25d3ad2b235d3f94531705d9048a1bb09f..0cfefb3474f9cdd24a6cbc88784bda0cb48e2ea2 100644 (file)
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -473,6 +473,10 @@ static int get_filesystems(const char *filename, char ***filesystems, const char
        return rc;
 }
 
+/*
+ * Returns zero also if not found any matching filesystem. Always check
+ * @filesystems pointer!
+ */
 int mnt_get_filesystems(char ***filesystems, const char *pattern)
 {
        int rc;