1 files changed, 20 insertions, 18 deletions

diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
index bee09d062057..fe00cdfd0267 100644
--- a/security/tomoyo/mount.c
+++ b/security/tomoyo/mount.c
@@ -199,30 +199,32 @@ int tomoyo_mount_permission(char *dev_name, struct path *path,
         if (flags & MS_REMOUNT) {
                 type = tomoyo_mounts[TOMOYO_MOUNT_REMOUNT];
                 flags &= ~MS_REMOUNT;
-        }
-        if (flags & MS_MOVE) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MOVE];
-                flags &= ~MS_MOVE;
-        }
-        if (flags & MS_BIND) {
+        } else if (flags & MS_BIND) {
                 type = tomoyo_mounts[TOMOYO_MOUNT_BIND];
                 flags &= ~MS_BIND;
-        }
-        if (flags & MS_UNBINDABLE) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_UNBINDABLE];
-                flags &= ~MS_UNBINDABLE;
-        }
-        if (flags & MS_PRIVATE) {
+        } else if (flags & MS_SHARED) {
+                if (flags & (MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+                        return -EINVAL;
+                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SHARED];
+                flags &= ~MS_SHARED;
+        } else if (flags & MS_PRIVATE) {
+                if (flags & (MS_SHARED | MS_SLAVE | MS_UNBINDABLE))
+                        return -EINVAL;
                 type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_PRIVATE];
                 flags &= ~MS_PRIVATE;
-        }
-        if (flags & MS_SLAVE) {
+        } else if (flags & MS_SLAVE) {
+                if (flags & (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE))
+                        return -EINVAL;
                 type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SLAVE];
                 flags &= ~MS_SLAVE;
-        }
-        if (flags & MS_SHARED) {
-                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_SHARED];
-                flags &= ~MS_SHARED;
+        } else if (flags & MS_UNBINDABLE) {
+                if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE))
+                        return -EINVAL;
+                type = tomoyo_mounts[TOMOYO_MOUNT_MAKE_UNBINDABLE];
+                flags &= ~MS_UNBINDABLE;
+        } else if (flags & MS_MOVE) {
+                type = tomoyo_mounts[TOMOYO_MOUNT_MOVE];
+                flags &= ~MS_MOVE;
         }
         if (!type)
                 type = "<NULL>";