fs: Limit sys_mount to only request filesystem modules.

Modify the request_module to prefix the file system type with "fs-"
and add aliases to all of the filesystems that can be built as modules
to match.

A common practice is to build all of the kernel code and leave code
that is not commonly needed as modules, with the result that many
users are exposed to any bug anywhere in the kernel.

Looking for filesystems with a fs- prefix limits the pool of possible
modules that can be loaded by mount to just filesystems trivially
making things safer with no real cost.

Using aliases means user space can control the policy of which
filesystem modules are auto-loaded by editing /etc/modprobe.d/*.conf
with blacklist and alias directives.  Allowing simple, safe,
well understood work-arounds to known problematic software.

This also addresses a rare but unfortunate problem where the filesystem
name is not the same as it's module name and module auto-loading
would not work.  While writing this patch I saw a handful of such
cases.  The most significant being autofs that lives in the module
autofs4.

This is relevant to user namespaces because we can reach the request
module in get_fs_type() without having any special permissions, and
people get uncomfortable when a user specified string (in this case
the filesystem type) goes all of the way to request_module.

After having looked at this issue I don't think there is any
particular reason to perform any filtering or permission checks beyond
making it clear in the module request that we want a filesystem
module.  The common pattern in the kernel is to call request_module()
without regards to the users permissions.  In general all a filesystem
module does once loaded is call register_filesystem() and go to sleep.
Which means there is not much attack surface exposed by loading a
filesytem module unless the filesystem is mounted.  In a user
namespace filesystems are not mounted unless .fs_flags = FS_USERNS_MOUNT,
which most filesystems do not set today.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Kees Cook <keescook@chromium.org>
Reported-by: Kees Cook <keescook@google.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2013-03-02 19:39:14 -08:00
parent ba0e3427b0
commit 7f78e03513
69 changed files with 77 additions and 12 deletions

View File

@ -619,6 +619,7 @@ static struct file_system_type pfm_fs_type = {
.mount = pfmfs_mount, .mount = pfmfs_mount,
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
}; };
MODULE_ALIAS_FS("pfmfs");
DEFINE_PER_CPU(unsigned long, pfm_syst_info); DEFINE_PER_CPU(unsigned long, pfm_syst_info);
DEFINE_PER_CPU(struct task_struct *, pmu_owner); DEFINE_PER_CPU(struct task_struct *, pmu_owner);

View File

@ -749,6 +749,7 @@ static struct file_system_type spufs_type = {
.mount = spufs_mount, .mount = spufs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("spufs");
static int __init spufs_init(void) static int __init spufs_init(void)
{ {

View File

@ -456,6 +456,7 @@ static struct file_system_type hypfs_type = {
.mount = hypfs_mount, .mount = hypfs_mount,
.kill_sb = hypfs_kill_super .kill_sb = hypfs_kill_super
}; };
MODULE_ALIAS_FS("s390_hypfs");
static const struct super_operations hypfs_s_ops = { static const struct super_operations hypfs_s_ops = {
.statfs = simple_statfs, .statfs = simple_statfs,

View File

@ -1234,6 +1234,7 @@ static struct file_system_type efivarfs_type = {
.mount = efivarfs_mount, .mount = efivarfs_mount,
.kill_sb = efivarfs_kill_sb, .kill_sb = efivarfs_kill_sb,
}; };
MODULE_ALIAS_FS("efivarfs");
/* /*
* Handle negative dentry. * Handle negative dentry.

View File

@ -410,6 +410,7 @@ static struct file_system_type ipathfs_fs_type = {
.mount = ipathfs_mount, .mount = ipathfs_mount,
.kill_sb = ipathfs_kill_super, .kill_sb = ipathfs_kill_super,
}; };
MODULE_ALIAS_FS("ipathfs");
int __init ipath_init_ipathfs(void) int __init ipath_init_ipathfs(void)
{ {

View File

@ -604,6 +604,7 @@ static struct file_system_type qibfs_fs_type = {
.mount = qibfs_mount, .mount = qibfs_mount,
.kill_sb = qibfs_kill_super, .kill_sb = qibfs_kill_super,
}; };
MODULE_ALIAS_FS("ipathfs");
int __init qib_init_qibfs(void) int __init qib_init_qibfs(void)
{ {

View File

@ -110,6 +110,7 @@ static struct file_system_type ibmasmfs_type = {
.mount = ibmasmfs_mount, .mount = ibmasmfs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("ibmasmfs");
static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
{ {

View File

@ -1238,6 +1238,7 @@ static struct file_system_type mtd_inodefs_type = {
.mount = mtd_inodefs_mount, .mount = mtd_inodefs_mount,
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
}; };
MODULE_ALIAS_FS("mtd_inodefs");
static int __init init_mtdchar(void) static int __init init_mtdchar(void)
{ {

View File

@ -276,6 +276,7 @@ static struct file_system_type oprofilefs_type = {
.mount = oprofilefs_mount, .mount = oprofilefs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("oprofilefs");
int __init oprofilefs_register(void) int __init oprofilefs_register(void)

View File

@ -1223,6 +1223,7 @@ static struct file_system_type ffs_fs_type = {
.mount = ffs_fs_mount, .mount = ffs_fs_mount,
.kill_sb = ffs_fs_kill_sb, .kill_sb = ffs_fs_kill_sb,
}; };
MODULE_ALIAS_FS("functionfs");
/* Driver's main init/cleanup functions *************************************/ /* Driver's main init/cleanup functions *************************************/

View File

@ -1235,6 +1235,7 @@ static struct file_system_type ffs_fs_type = {
.mount = ffs_fs_mount, .mount = ffs_fs_mount,
.kill_sb = ffs_fs_kill_sb, .kill_sb = ffs_fs_kill_sb,
}; };
MODULE_ALIAS_FS("functionfs");
/* Driver's main init/cleanup functions *************************************/ /* Driver's main init/cleanup functions *************************************/

View File

@ -2105,6 +2105,7 @@ static struct file_system_type gadgetfs_type = {
.mount = gadgetfs_mount, .mount = gadgetfs_mount,
.kill_sb = gadgetfs_kill_sb, .kill_sb = gadgetfs_kill_sb,
}; };
MODULE_ALIAS_FS("gadgetfs");
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/

View File

@ -75,6 +75,7 @@ static struct file_system_type xenfs_type = {
.mount = xenfs_mount, .mount = xenfs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("xenfs");
static int __init xenfs_init(void) static int __init xenfs_init(void)
{ {

View File

@ -365,3 +365,4 @@ struct file_system_type v9fs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fs_flags = FS_RENAME_DOES_D_MOVE, .fs_flags = FS_RENAME_DOES_D_MOVE,
}; };
MODULE_ALIAS_FS("9p");

View File

@ -524,6 +524,7 @@ static struct file_system_type adfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("adfs");
static int __init init_adfs_fs(void) static int __init init_adfs_fs(void)
{ {

View File

@ -622,6 +622,7 @@ static struct file_system_type affs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("affs");
static int __init init_affs_fs(void) static int __init init_affs_fs(void)
{ {

View File

@ -45,6 +45,7 @@ struct file_system_type afs_fs_type = {
.kill_sb = afs_kill_super, .kill_sb = afs_kill_super,
.fs_flags = 0, .fs_flags = 0,
}; };
MODULE_ALIAS_FS("afs");
static const struct super_operations afs_super_ops = { static const struct super_operations afs_super_ops = {
.statfs = afs_statfs, .statfs = afs_statfs,

View File

@ -26,6 +26,7 @@ static struct file_system_type autofs_fs_type = {
.mount = autofs_mount, .mount = autofs_mount,
.kill_sb = autofs4_kill_sb, .kill_sb = autofs4_kill_sb,
}; };
MODULE_ALIAS_FS("autofs");
static int __init init_autofs4_fs(void) static int __init init_autofs4_fs(void)
{ {

View File

@ -951,6 +951,7 @@ static struct file_system_type befs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("befs");
static int __init static int __init
init_befs_fs(void) init_befs_fs(void)

View File

@ -473,6 +473,7 @@ static struct file_system_type bfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("bfs");
static int __init init_bfs_fs(void) static int __init init_bfs_fs(void)
{ {

View File

@ -720,6 +720,7 @@ static struct file_system_type bm_fs_type = {
.mount = bm_mount, .mount = bm_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("binfmt_misc");
static int __init init_misc_binfmt(void) static int __init init_misc_binfmt(void)
{ {

View File

@ -1558,6 +1558,7 @@ static struct file_system_type btrfs_fs_type = {
.kill_sb = btrfs_kill_super, .kill_sb = btrfs_kill_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("btrfs");
/* /*
* used by btrfsctl to scan devices when no FS is mounted * used by btrfsctl to scan devices when no FS is mounted

View File

@ -952,6 +952,7 @@ static struct file_system_type ceph_fs_type = {
.kill_sb = ceph_kill_sb, .kill_sb = ceph_kill_sb,
.fs_flags = FS_RENAME_DOES_D_MOVE, .fs_flags = FS_RENAME_DOES_D_MOVE,
}; };
MODULE_ALIAS_FS("ceph");
#define _STRINGIFY(x) #x #define _STRINGIFY(x) #x
#define STRINGIFY(x) _STRINGIFY(x) #define STRINGIFY(x) _STRINGIFY(x)

View File

@ -329,4 +329,5 @@ struct file_system_type coda_fs_type = {
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
.fs_flags = FS_BINARY_MOUNTDATA, .fs_flags = FS_BINARY_MOUNTDATA,
}; };
MODULE_ALIAS_FS("coda");

View File

@ -114,6 +114,7 @@ static struct file_system_type configfs_fs_type = {
.mount = configfs_do_mount, .mount = configfs_do_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("configfs");
struct dentry *configfs_pin_fs(void) struct dentry *configfs_pin_fs(void)
{ {

View File

@ -573,6 +573,7 @@ static struct file_system_type cramfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("cramfs");
static int __init init_cramfs_fs(void) static int __init init_cramfs_fs(void)
{ {

View File

@ -299,6 +299,7 @@ static struct file_system_type debug_fs_type = {
.mount = debug_mount, .mount = debug_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("debugfs");
static struct dentry *__create_file(const char *name, umode_t mode, static struct dentry *__create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,

View File

@ -510,6 +510,7 @@ static struct file_system_type devpts_fs_type = {
.fs_flags = FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT, .fs_flags = FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT,
#endif #endif
}; };
MODULE_ALIAS_FS("devpts");
/* /*
* The normal naming convention is simply /dev/pts/<number>; this conforms * The normal naming convention is simply /dev/pts/<number>; this conforms

View File

@ -629,6 +629,7 @@ static struct file_system_type ecryptfs_fs_type = {
.kill_sb = ecryptfs_kill_block_super, .kill_sb = ecryptfs_kill_block_super,
.fs_flags = 0 .fs_flags = 0
}; };
MODULE_ALIAS_FS("ecryptfs");
/** /**
* inode_info_init_once * inode_info_init_once

View File

@ -33,6 +33,7 @@ static struct file_system_type efs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("efs");
static struct pt_types sgi_pt_types[] = { static struct pt_types sgi_pt_types[] = {
{0x00, "SGI vh"}, {0x00, "SGI vh"},

View File

@ -1010,6 +1010,7 @@ static struct file_system_type exofs_type = {
.mount = exofs_mount, .mount = exofs_mount,
.kill_sb = generic_shutdown_super, .kill_sb = generic_shutdown_super,
}; };
MODULE_ALIAS_FS("exofs");
static int __init init_exofs(void) static int __init init_exofs(void)
{ {

View File

@ -1536,6 +1536,7 @@ static struct file_system_type ext2_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext2");
static int __init init_ext2_fs(void) static int __init init_ext2_fs(void)
{ {

View File

@ -3068,6 +3068,7 @@ static struct file_system_type ext3_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext3");
static int __init init_ext3_fs(void) static int __init init_ext3_fs(void)
{ {

View File

@ -90,6 +90,7 @@ static struct file_system_type ext2_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext2");
#define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type) #define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type)
#else #else
#define IS_EXT2_SB(sb) (0) #define IS_EXT2_SB(sb) (0)
@ -104,6 +105,7 @@ static struct file_system_type ext3_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext3");
#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type) #define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)
#else #else
#define IS_EXT3_SB(sb) (0) #define IS_EXT3_SB(sb) (0)
@ -5152,7 +5154,6 @@ static inline int ext2_feature_set_ok(struct super_block *sb)
return 0; return 0;
return 1; return 1;
} }
MODULE_ALIAS("ext2");
#else #else
static inline void register_as_ext2(void) { } static inline void register_as_ext2(void) { }
static inline void unregister_as_ext2(void) { } static inline void unregister_as_ext2(void) { }
@ -5185,7 +5186,6 @@ static inline int ext3_feature_set_ok(struct super_block *sb)
return 0; return 0;
return 1; return 1;
} }
MODULE_ALIAS("ext3");
#else #else
static inline void register_as_ext3(void) { } static inline void register_as_ext3(void) { }
static inline void unregister_as_ext3(void) { } static inline void unregister_as_ext3(void) { }
@ -5199,6 +5199,7 @@ static struct file_system_type ext4_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ext4");
static int __init ext4_init_feat_adverts(void) static int __init ext4_init_feat_adverts(void)
{ {

View File

@ -687,6 +687,7 @@ static struct file_system_type f2fs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("f2fs");
static int __init init_inodecache(void) static int __init init_inodecache(void)
{ {

View File

@ -668,6 +668,7 @@ static struct file_system_type msdos_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("msdos");
static int __init init_msdos_fs(void) static int __init init_msdos_fs(void)
{ {

View File

@ -1073,6 +1073,7 @@ static struct file_system_type vfat_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("vfat");
static int __init init_vfat_fs(void) static int __init init_vfat_fs(void)
{ {

View File

@ -273,7 +273,7 @@ struct file_system_type *get_fs_type(const char *name)
int len = dot ? dot - name : strlen(name); int len = dot ? dot - name : strlen(name);
fs = __get_fs_type(name, len); fs = __get_fs_type(name, len);
if (!fs && (request_module("%.*s", len, name) == 0)) if (!fs && (request_module("fs-%.*s", len, name) == 0))
fs = __get_fs_type(name, len); fs = __get_fs_type(name, len);
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {

View File

@ -52,7 +52,6 @@ MODULE_AUTHOR("Christoph Hellwig");
MODULE_DESCRIPTION("Veritas Filesystem (VxFS) driver"); MODULE_DESCRIPTION("Veritas Filesystem (VxFS) driver");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_ALIAS("vxfs"); /* makes mount -t vxfs autoload the module */
static void vxfs_put_super(struct super_block *); static void vxfs_put_super(struct super_block *);
@ -258,6 +257,7 @@ static struct file_system_type vxfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */
static int __init static int __init
vxfs_init(void) vxfs_init(void)

View File

@ -341,6 +341,7 @@ static struct file_system_type fuse_ctl_fs_type = {
.mount = fuse_ctl_mount, .mount = fuse_ctl_mount,
.kill_sb = fuse_ctl_kill_sb, .kill_sb = fuse_ctl_kill_sb,
}; };
MODULE_ALIAS_FS("fusectl");
int __init fuse_ctl_init(void) int __init fuse_ctl_init(void)
{ {

View File

@ -1117,6 +1117,7 @@ static struct file_system_type fuse_fs_type = {
.mount = fuse_mount, .mount = fuse_mount,
.kill_sb = fuse_kill_sb_anon, .kill_sb = fuse_kill_sb_anon,
}; };
MODULE_ALIAS_FS("fuse");
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
static struct dentry *fuse_mount_blk(struct file_system_type *fs_type, static struct dentry *fuse_mount_blk(struct file_system_type *fs_type,
@ -1146,6 +1147,7 @@ static struct file_system_type fuseblk_fs_type = {
.kill_sb = fuse_kill_sb_blk, .kill_sb = fuse_kill_sb_blk,
.fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE, .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE,
}; };
MODULE_ALIAS_FS("fuseblk");
static inline int register_fuseblk(void) static inline int register_fuseblk(void)
{ {

View File

@ -20,6 +20,7 @@
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/lockdep.h> #include <linux/lockdep.h>
#include <linux/module.h>
#include "gfs2.h" #include "gfs2.h"
#include "incore.h" #include "incore.h"
@ -1425,6 +1426,7 @@ struct file_system_type gfs2_fs_type = {
.kill_sb = gfs2_kill_sb, .kill_sb = gfs2_kill_sb,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
MODULE_ALIAS_FS("gfs2");
struct file_system_type gfs2meta_fs_type = { struct file_system_type gfs2meta_fs_type = {
.name = "gfs2meta", .name = "gfs2meta",
@ -1432,4 +1434,4 @@ struct file_system_type gfs2meta_fs_type = {
.mount = gfs2_mount_meta, .mount = gfs2_mount_meta,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
MODULE_ALIAS_FS("gfs2meta");

View File

@ -466,6 +466,7 @@ static struct file_system_type hfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("hfs");
static void hfs_init_once(void *p) static void hfs_init_once(void *p)
{ {

View File

@ -654,6 +654,7 @@ static struct file_system_type hfsplus_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("hfsplus");
static void hfsplus_init_once(void *p) static void hfsplus_init_once(void *p)
{ {

View File

@ -748,6 +748,7 @@ static struct file_system_type hppfs_type = {
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
.fs_flags = 0, .fs_flags = 0,
}; };
MODULE_ALIAS_FS("hppfs");
static int __init init_hppfs(void) static int __init init_hppfs(void)
{ {

View File

@ -896,6 +896,7 @@ static struct file_system_type hugetlbfs_fs_type = {
.mount = hugetlbfs_mount, .mount = hugetlbfs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("hugetlbfs");
static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE]; static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];

View File

@ -1556,6 +1556,7 @@ static struct file_system_type iso9660_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("iso9660");
static int __init init_iso9660_fs(void) static int __init init_iso9660_fs(void)
{ {
@ -1593,5 +1594,3 @@ static void __exit exit_iso9660_fs(void)
module_init(init_iso9660_fs) module_init(init_iso9660_fs)
module_exit(exit_iso9660_fs) module_exit(exit_iso9660_fs)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Actual filesystem name is iso9660, as requested in filesystems.c */
MODULE_ALIAS("iso9660");

View File

@ -356,6 +356,7 @@ static struct file_system_type jffs2_fs_type = {
.mount = jffs2_mount, .mount = jffs2_mount,
.kill_sb = jffs2_kill_sb, .kill_sb = jffs2_kill_sb,
}; };
MODULE_ALIAS_FS("jffs2");
static int __init init_jffs2_fs(void) static int __init init_jffs2_fs(void)
{ {

View File

@ -833,6 +833,7 @@ static struct file_system_type jfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("jfs");
static void init_once(void *foo) static void init_once(void *foo)
{ {

View File

@ -608,6 +608,7 @@ static struct file_system_type logfs_fs_type = {
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("logfs");
static int __init logfs_init(void) static int __init logfs_init(void)
{ {

View File

@ -660,6 +660,7 @@ static struct file_system_type minix_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("minix");
static int __init init_minix_fs(void) static int __init init_minix_fs(void)
{ {

View File

@ -1051,6 +1051,7 @@ static struct file_system_type ncp_fs_type = {
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
.fs_flags = FS_BINARY_MOUNTDATA, .fs_flags = FS_BINARY_MOUNTDATA,
}; };
MODULE_ALIAS_FS("ncpfs");
static int __init init_ncp_fs(void) static int __init init_ncp_fs(void)
{ {

View File

@ -294,6 +294,7 @@ struct file_system_type nfs_fs_type = {
.kill_sb = nfs_kill_super, .kill_sb = nfs_kill_super,
.fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA,
}; };
MODULE_ALIAS_FS("nfs");
EXPORT_SYMBOL_GPL(nfs_fs_type); EXPORT_SYMBOL_GPL(nfs_fs_type);
struct file_system_type nfs_xdev_fs_type = { struct file_system_type nfs_xdev_fs_type = {
@ -333,6 +334,7 @@ struct file_system_type nfs4_fs_type = {
.kill_sb = nfs_kill_super, .kill_sb = nfs_kill_super,
.fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA,
}; };
MODULE_ALIAS_FS("nfs4");
EXPORT_SYMBOL_GPL(nfs4_fs_type); EXPORT_SYMBOL_GPL(nfs4_fs_type);
static int __init register_nfs4_fs(void) static int __init register_nfs4_fs(void)
@ -2717,6 +2719,5 @@ module_param(send_implementation_id, ushort, 0644);
MODULE_PARM_DESC(send_implementation_id, MODULE_PARM_DESC(send_implementation_id,
"Send implementation ID with NFSv4.1 exchange_id"); "Send implementation ID with NFSv4.1 exchange_id");
MODULE_PARM_DESC(nfs4_unique_id, "nfs_client_id4 uniquifier string"); MODULE_PARM_DESC(nfs4_unique_id, "nfs_client_id4 uniquifier string");
MODULE_ALIAS("nfs4");
#endif /* CONFIG_NFS_V4 */ #endif /* CONFIG_NFS_V4 */

View File

@ -1090,6 +1090,7 @@ static struct file_system_type nfsd_fs_type = {
.mount = nfsd_mount, .mount = nfsd_mount,
.kill_sb = nfsd_umount, .kill_sb = nfsd_umount,
}; };
MODULE_ALIAS_FS("nfsd");
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int create_proc_exports_entry(void) static int create_proc_exports_entry(void)

View File

@ -1361,6 +1361,7 @@ struct file_system_type nilfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("nilfs2");
static void nilfs_inode_init_once(void *obj) static void nilfs_inode_init_once(void *obj)
{ {

View File

@ -3079,6 +3079,7 @@ static struct file_system_type ntfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ntfs");
/* Stable names for the slab caches. */ /* Stable names for the slab caches. */
static const char ntfs_index_ctx_cache_name[] = "ntfs_index_ctx_cache"; static const char ntfs_index_ctx_cache_name[] = "ntfs_index_ctx_cache";

View File

@ -640,6 +640,7 @@ static struct file_system_type dlmfs_fs_type = {
.mount = dlmfs_mount, .mount = dlmfs_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };
MODULE_ALIAS_FS("ocfs2_dlmfs");
static int __init init_dlmfs_fs(void) static int __init init_dlmfs_fs(void)
{ {

View File

@ -572,6 +572,7 @@ static struct file_system_type omfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("omfs");
static int __init init_omfs_fs(void) static int __init init_omfs_fs(void)
{ {

View File

@ -432,6 +432,7 @@ static struct file_system_type openprom_fs_type = {
.mount = openprom_mount, .mount = openprom_mount,
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
}; };
MODULE_ALIAS_FS("openpromfs");
static void op_inode_init_once(void *data) static void op_inode_init_once(void *data)
{ {

View File

@ -412,6 +412,7 @@ static struct file_system_type qnx4_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("qnx4");
static int __init init_qnx4_fs(void) static int __init init_qnx4_fs(void)
{ {

View File

@ -672,6 +672,7 @@ static struct file_system_type qnx6_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("qnx6");
static int __init init_qnx6_fs(void) static int __init init_qnx6_fs(void)
{ {

View File

@ -2434,6 +2434,7 @@ struct file_system_type reiserfs_fs_type = {
.kill_sb = reiserfs_kill_sb, .kill_sb = reiserfs_kill_sb,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("reiserfs");
MODULE_DESCRIPTION("ReiserFS journaled filesystem"); MODULE_DESCRIPTION("ReiserFS journaled filesystem");
MODULE_AUTHOR("Hans Reiser <reiser@namesys.com>"); MODULE_AUTHOR("Hans Reiser <reiser@namesys.com>");

View File

@ -599,6 +599,7 @@ static struct file_system_type romfs_fs_type = {
.kill_sb = romfs_kill_sb, .kill_sb = romfs_kill_sb,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("romfs");
/* /*
* inode storage initialiser * inode storage initialiser

View File

@ -545,6 +545,7 @@ static struct file_system_type sysv_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("sysv");
static struct file_system_type v7_fs_type = { static struct file_system_type v7_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -553,6 +554,7 @@ static struct file_system_type v7_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("v7");
static int __init init_sysv_fs(void) static int __init init_sysv_fs(void)
{ {
@ -586,5 +588,4 @@ static void __exit exit_sysv_fs(void)
module_init(init_sysv_fs) module_init(init_sysv_fs)
module_exit(exit_sysv_fs) module_exit(exit_sysv_fs)
MODULE_ALIAS("v7");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

View File

@ -2174,6 +2174,7 @@ static struct file_system_type ubifs_fs_type = {
.mount = ubifs_mount, .mount = ubifs_mount,
.kill_sb = kill_ubifs_super, .kill_sb = kill_ubifs_super,
}; };
MODULE_ALIAS_FS("ubifs");
/* /*
* Inode slab cache constructor. * Inode slab cache constructor.

View File

@ -1500,6 +1500,7 @@ static struct file_system_type ufs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("ufs");
static int __init init_ufs_fs(void) static int __init init_ufs_fs(void)
{ {

View File

@ -1561,6 +1561,7 @@ static struct file_system_type xfs_fs_type = {
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };
MODULE_ALIAS_FS("xfs");
STATIC int __init STATIC int __init
xfs_init_zones(void) xfs_init_zones(void)

View File

@ -1825,6 +1825,8 @@ struct file_system_type {
struct lock_class_key i_mutex_dir_key; struct lock_class_key i_mutex_dir_key;
}; };
#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)
extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags, extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
void *data, int (*fill_super)(struct super_block *, void *, int)); void *data, int (*fill_super)(struct super_block *, void *, int));
extern struct dentry *mount_bdev(struct file_system_type *fs_type, extern struct dentry *mount_bdev(struct file_system_type *fs_type,

View File

@ -1174,6 +1174,7 @@ static struct file_system_type rpc_pipe_fs_type = {
.mount = rpc_mount, .mount = rpc_mount,
.kill_sb = rpc_kill_sb, .kill_sb = rpc_kill_sb,
}; };
MODULE_ALIAS_FS("rpc_pipefs");
static void static void
init_once(void *foo) init_once(void *foo)
@ -1218,6 +1219,3 @@ void unregister_rpc_pipefs(void)
kmem_cache_destroy(rpc_inode_cachep); kmem_cache_destroy(rpc_inode_cachep);
unregister_filesystem(&rpc_pipe_fs_type); unregister_filesystem(&rpc_pipe_fs_type);
} }
/* Make 'mount -t rpc_pipefs ...' autoload this module. */
MODULE_ALIAS("rpc_pipefs");