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:35:09 -0700 |
| commit | a7dbb3e347aa3916f681b10cfbc7d12ed6ae7b34 (patch) | |
| tree | 30a796044280c4e51b5b25e6ced0bb73518f16bd | |
| parent | aea9dd519b41025500e678587908705ad499ac38 (diff) | |
| download | lwn-a7dbb3e347aa3916f681b10cfbc7d12ed6ae7b34.tar.gz lwn-a7dbb3e347aa3916f681b10cfbc7d12ed6ae7b34.zip | |
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>
| -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 00409add4d96..7f6a9348c589 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1274,6 +1274,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); |