summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenzap <46226844+tenzap@users.noreply.github.com>2019-09-15 17:57:08 +0200
committerNikolaus Rath <Nikolaus@rath.org>2019-09-15 08:57:08 -0700
commit6d55007027dfe7b75a74899f497f075046cc5404 (patch)
tree0f5bd9312b14a310d2dce90e0b46404e196112f1
parentd04687923194d906fe5ad82dcd546c9807bf15b6 (diff)
downloadfuse-6d55007027dfe7b75a74899f497f075046cc5404.tar.gz
Whitelist UFSD (backport to 2.9 branch) (#452)
-rw-r--r--ChangeLog6
-rw-r--r--util/fusermount.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 13a369f..5574f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Unreleased Changes
+==================
+
+* Added UFSD to whitelist (so users can now mount FUSE filesystems
+ on mountpoints within UFSD filesystems).
+
FUSE 2.9.9 (2019-01-04)
=======================
diff --git a/util/fusermount.c b/util/fusermount.c
index 4b799d9..5af487a 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -1049,6 +1049,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
0x73717368 /* SQUASHFS_MAGIC */,
0x01021994 /* TMPFS_MAGIC */,
0x24051905 /* UBIFS_SUPER_MAGIC */,
+ 0x736675005346544e /* UFSD */,
0x58465342 /* XFS_SB_MAGIC */,
0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
};