From: 1c7718e7 <shirokovMartin@gmail.com>
Date: Sat, 9 Mar 2019 10:39:32 +0000 (+0200)
Subject: Add HFS+ to filesystem whitelist (#347)
X-Git-Tag: fuse-3.4.2~2
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9e6cdc2c0c04731016e57da1fe31861fd63ea59d;p=qemu-gpiodev%2Flibfuse.git

Add HFS+ to filesystem whitelist (#347)
---

diff --git a/ChangeLog.rst b/ChangeLog.rst
index f01de7f..422ff5a 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -4,6 +4,8 @@ Unreleased Changes
 * Fixed a memory leak in `examples/passthrough_ll.c`.
 * Added OpenAFS to whitelist (so users can now mount FUSE filesystems
   on mountpoints within OpenAFS filesystems).
+* Added HFS+ to whitelist (so users can now mount FUSE filesystems
+  on mountpoints within HFS+ filesystems).
 
 
 libfuse 3.4.1 (2018-12-22)
diff --git a/util/fusermount.c b/util/fusermount.c
index ebc0689..7f9b7cd 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -1040,6 +1040,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
 		0x24051905 /* UBIFS_SUPER_MAGIC */,
 		0x58465342 /* XFS_SB_MAGIC */,
 		0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
+		0x0000482b /* HFSPLUS_SUPER_MAGIC */,
 	};
 	for (i = 0; i < sizeof(f_type_whitelist)/sizeof(f_type_whitelist[0]); i++) {
 		if (f_type_whitelist[i] == fs_buf.f_type)