1 files changed, 7 insertions, 3 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index e4b953f760dd..e32f4b5f23a5 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -834,10 +834,14 @@ static int selinux_set_mnt_opts(struct super_block *sb,
         }
 
         /*
-         * If this is a user namespace mount, no contexts are allowed
-         * on the command line and security labels must be ignored.
+         * If this is a user namespace mount and the filesystem type is not
+         * explicitly whitelisted, then no contexts are allowed on the command
+         * line and security labels must be ignored.
          */
-        if (sb->s_user_ns != &init_user_ns) {
+        if (sb->s_user_ns != &init_user_ns &&
+            strcmp(sb->s_type->name, "tmpfs") &&
+            strcmp(sb->s_type->name, "ramfs") &&
+            strcmp(sb->s_type->name, "devpts")) {
                 if (context_sid || fscontext_sid || rootcontext_sid ||
                     defcontext_sid) {
                         rc = -EACCES;