diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-10-08 12:32:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 09:40:09 -0700 |
| commit | c436c9115dab21fbdcae850e324d7ac3f73f04b7 (patch) | |
| tree | dc6cdbc420829fd5bec581171466d81aa10ec9a9 /fs | |
| parent | 7d6d0aa7f8e689dfc91bf5c5b6152bc1a95c67e1 (diff) | |
fs: Add a missing permission check to do_umount
commit a1480dcc3c706e309a88884723446f2e84fedd5b upstream.
Accessing do_remount_sb should require global CAP_SYS_ADMIN, but
only one of the two call sites was appropriately protected.
Fixes CVE-2014-7975.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 140d17705683..e544a0680a7c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1374,6 +1374,8 @@ static int do_umount(struct mount *mnt, int flags) * Special case for "unmounting" root ... * we just try to remount it readonly. */ + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; down_write(&sb->s_umount); if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); |