summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-10-08 12:32:47 -0700
committerAndy Lutomirski <luto@amacapital.net>2014-10-08 12:32:47 -0700
commita1480dcc3c706e309a88884723446f2e84fedd5b (patch)
treefa2a425b8607586c11127ea35344d893e6a4a4f0 /fs/namespace.c
parentbfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff)
downloadop-kernel-dev-a1480dcc3c706e309a88884723446f2e84fedd5b.zip
op-kernel-dev-a1480dcc3c706e309a88884723446f2e84fedd5b.tar.gz
fs: Add a missing permission check to do_umount
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>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index ef42d9b..7f67b46 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1356,6 +1356,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);
OpenPOWER on IntegriCloud