49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From: "Eric W. Biederman" <ebiederm@xmission.com>
|
|
Date: Mon, 28 Jul 2014 16:26:53 -0700
|
|
Subject: [1/5] mnt: Only change user settable mount flags in remount
|
|
Origin: https://git.kernel.org/linus/a6138db815df5ee542d848318e5dae681590fccd
|
|
|
|
Kenton Varda <kenton@sandstorm.io> discovered that by remounting a
|
|
read-only bind mount read-only in a user namespace the
|
|
MNT_LOCK_READONLY bit would be cleared, allowing an unprivileged user
|
|
to the remount a read-only mount read-write.
|
|
|
|
Correct this by replacing the mask of mount flags to preserve
|
|
with a mask of mount flags that may be changed, and preserve
|
|
all others. This ensures that any future bugs with this mask and
|
|
remount will fail in an easy to detect way where new mount flags
|
|
simply won't change.
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
|
|
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
|
|
---
|
|
fs/namespace.c | 2 +-
|
|
include/linux/mount.h | 4 +++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/fs/namespace.c
|
|
+++ b/fs/namespace.c
|
|
@@ -1939,7 +1939,7 @@ static int do_remount(struct path *path,
|
|
err = do_remount_sb(sb, flags, data, 0);
|
|
if (!err) {
|
|
lock_mount_hash();
|
|
- mnt_flags |= mnt->mnt.mnt_flags & MNT_PROPAGATION_MASK;
|
|
+ mnt_flags |= mnt->mnt.mnt_flags & ~MNT_USER_SETTABLE_MASK;
|
|
mnt->mnt.mnt_flags = mnt_flags;
|
|
touch_mnt_namespace(mnt->mnt_ns);
|
|
unlock_mount_hash();
|
|
--- a/include/linux/mount.h
|
|
+++ b/include/linux/mount.h
|
|
@@ -42,7 +42,9 @@ struct mnt_namespace;
|
|
* flag, consider how it interacts with shared mounts.
|
|
*/
|
|
#define MNT_SHARED_MASK (MNT_UNBINDABLE)
|
|
-#define MNT_PROPAGATION_MASK (MNT_SHARED | MNT_UNBINDABLE)
|
|
+#define MNT_USER_SETTABLE_MASK (MNT_NOSUID | MNT_NODEV | MNT_NOEXEC \
|
|
+ | MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME \
|
|
+ | MNT_READONLY)
|
|
|
|
#define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \
|
|
MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED)
|