diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-02 22:39:14 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-03 22:36:31 -0500 |
commit | 7f78e0351394052e1a6293e175825eb5c7869507 (patch) | |
tree | 76493af33d02bd3f411e69f95b0bcdfff50412b4 /fs/ocfs2 | |
parent | ba0e3427b03c3d1550239779eca5c1c5a53a2152 (diff) |
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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 4c5fc8d77dc2..12bafb7265ce 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c | |||
@@ -640,6 +640,7 @@ static struct file_system_type dlmfs_fs_type = { | |||
640 | .mount = dlmfs_mount, | 640 | .mount = dlmfs_mount, |
641 | .kill_sb = kill_litter_super, | 641 | .kill_sb = kill_litter_super, |
642 | }; | 642 | }; |
643 | MODULE_ALIAS_FS("ocfs2_dlmfs"); | ||
643 | 644 | ||
644 | static int __init init_dlmfs_fs(void) | 645 | static int __init init_dlmfs_fs(void) |
645 | { | 646 | { |