mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 29 Jul 2014 00:10:56 +0000 (17:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Sep 2014 16:19:21 +0000 (09:19 -0700)
commit9810174c0384f725a31be1dfc64a881695ad465d
treea1d00d468b3041e80988fecbf81a359743711397
parent98e68ce8f4a6d3ad72243eecd1022ba120b515d2
mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount

commit 07b645589dcda8b7a5249e096fece2a67556f0f4 upstream.

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.

Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/namespace.c