linux-kernel - [PATCH] [resend] fs: bound mount propagation fix

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 19 Apr 2011 13:00:03 +0400
From:	Roman Borisov <ext-roman.borisov@...ia.com>
To:	linux-kernel@...r.kernel.org
Cc:	linux-fsdevel@...r.kernel.org, viro@...iv.linux.org.uk,
	Roman Borisov <ext-roman.borisov@...ia.com>
Subject: [PATCH] [resend] fs: bound mount propagation fix

Fixed MS_SHARED, MS_SLAVE, MS_UNBINDABLE option handling; Existing options check
doesn't allow to have any options combinations because of integer comparison 
(not bitwise).

The issue was reported in "2.6.35-rc4: mount results with and without MS_SILENT differ"
thread where it has been discovered that MS_SILENT bit affects the mount behavior.

Signed-off-by: Roman Borisov <ext-roman.borisov@...ia.com>
---
 fs/namespace.c |    2 +-
 fs/pnode.c     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 7dba2ed..99fa501 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1743,7 +1743,7 @@ static int do_change_type(struct path *path, int flag)
 		return -EINVAL;
 
 	down_write(&namespace_sem);
-	if (type == MS_SHARED) {
+	if (type & MS_SHARED) {
 		err = invent_group_ids(mnt, recurse);
 		if (err)
 			goto out_unlock;
diff --git a/fs/pnode.c b/fs/pnode.c
index d42514e..e1b676b 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -131,15 +131,15 @@ static int do_make_slave(struct vfsmount *mnt)
  */
 void change_mnt_propagation(struct vfsmount *mnt, int type)
 {
-	if (type == MS_SHARED) {
+	if (type & MS_SHARED) {
 		set_mnt_shared(mnt);
 		return;
 	}
 	do_make_slave(mnt);
-	if (type != MS_SLAVE) {
+	if (!(type & MS_SLAVE)) {
 		list_del_init(&mnt->mnt_slave);
 		mnt->mnt_master = NULL;
-		if (type == MS_UNBINDABLE)
+		if (type & MS_UNBINDABLE)
 			mnt->mnt_flags |= MNT_UNBINDABLE;
 		else
 			mnt->mnt_flags &= ~MNT_UNBINDABLE;
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/