drivers/staging/exfat - by default, prohibit mount of fat/vfat

Concerns have been raised about the exfat driver accidentally mounting
fat/vfat file systems.  Add an extra configure option to help prevent that.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Link: https://lore.kernel.org/r/245727.1567183359@turing-police
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
index 78b32aa2ca19652168d34eadd74211814e5f7582..f52129c67f975e8864434e93877eb0219580663c 100644 (file)
--- a/drivers/staging/exfat/Kconfig
+++ b/drivers/staging/exfat/Kconfig
@@ -4,6 +4,14 @@ config EXFAT_FS
        help
          This adds support for the exFAT file system.
 
+config EXFAT_DONT_MOUNT_VFAT
+       bool "Prohibit mounting of fat/vfat filesysems by exFAT"
+       default y
+       help
+         By default, the exFAT driver will only mount exFAT filesystems, and refuse
+         to mount fat/vfat filesystems.  Set this to 'n' to allow the exFAT driver
+         to mount these filesystems.
+
 config EXFAT_DISCARD
        bool "enable discard support"
        depends on EXFAT_FS

diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
index 5b5c2ca8c9aa8f2ef393a236d6481657249f64e7..d9787635a3735fe9d5bc16136bee6d22889602a2 100644 (file)
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -486,10 +486,16 @@ static int ffsMountVol(struct super_block *sb)
                        break;
 
        if (i < 53) {
+#ifdef CONFIG_EXFAT_DONT_MOUNT_VFAT
+               ret = -EINVAL;
+               printk(KERN_INFO "EXFAT: Attempted to mount VFAT filesystem\n");
+               goto out;
+#else
                if (GET16(p_pbr->bpb + 11)) /* num_fat_sectors */
                        ret = fat16_mount(sb, p_pbr);
                else
                        ret = fat32_mount(sb, p_pbr);
+#endif
        } else {
                ret = exfat_mount(sb, p_pbr);
        }