[trusty,2/4] mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount
diff mbox

Message ID 1407937718-9362-3-git-send-email-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft Aug. 13, 2014, 1:48 p.m. UTC
From: "Eric W. Biederman" <ebiederm@xmission.com>

There are no races as locked mount flags are guaranteed to never change.

Moving the test into do_remount makes it more visible, and ensures all
filesystem remounts pass the MNT_LOCK_READONLY permission check.  This
second case is not an issue today as filesystem remounts are guarded
by capable(CAP_DAC_ADMIN) and thus will always fail in less privileged
mount namespaces, but it could become an issue in the future.

Cc: stable@vger.kernel.org
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

(cherry picked from commit 07b645589dcda8b7a5249e096fece2a67556f0f4)
CVE-2014-5206
BugLink: http://bugs.launchpad.net/bugs/1356318
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 fs/namespace.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Patch
diff mbox

diff --git a/fs/namespace.c b/fs/namespace.c
index c795e83..36860ea 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1916,9 +1916,6 @@  static int change_mount_flags(struct vfsmount *mnt, int ms_flags)
 	if (readonly_request == __mnt_is_readonly(mnt))
 		return 0;
 
-	if (mnt->mnt_flags & MNT_LOCK_READONLY)
-		return -EPERM;
-
 	if (readonly_request)
 		error = mnt_make_readonly(real_mount(mnt));
 	else
@@ -1944,6 +1941,16 @@  static int do_remount(struct path *path, int flags, int mnt_flags,
 	if (path->dentry != path->mnt->mnt_root)
 		return -EINVAL;
 
+	/* Don't allow changing of locked mnt flags.
+	 *
+	 * No locks need to be held here while testing the various
+	 * MNT_LOCK flags because those flags can never be cleared
+	 * once they are set.
+	 */
+	if ((mnt->mnt.mnt_flags & MNT_LOCK_READONLY) &&
+	    !(mnt_flags & MNT_READONLY)) {
+		return -EPERM;
+	}
 	err = security_sb_remount(sb, data);
 	if (err)
 		return err;