Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / security / selinux / include / classmap.h

diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
index 201f7e588a29d2cdaf44feb3dfa1543585b7cac4..32e9b03be3dd43e127f0aba3c97d38c9b0d5fce9 100644 (file)
--- a/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@ -7,7 +7,8 @@
 
 #define COMMON_FILE_PERMS COMMON_FILE_SOCK_PERMS, "unlink", "link", \
     "rename", "execute", "quotaon", "mounton", "audit_access", \
-    "open", "execmod"
+       "open", "execmod", "watch", "watch_mount", "watch_sb", \
+       "watch_with_perm", "watch_reads"
 
 #define COMMON_SOCK_PERMS COMMON_FILE_SOCK_PERMS, "bind", "connect", \
     "listen", "accept", "getopt", "setopt", "shutdown", "recvfrom",  \
@@ -60,7 +61,7 @@ struct security_class_mapping secclass_map[] = {
        { "filesystem",
          { "mount", "remount", "unmount", "getattr",
            "relabelfrom", "relabelto", "associate", "quotamod",
-           "quotaget", NULL } },
+           "quotaget", "watch", NULL } },
        { "file",
          { COMMON_FILE_PERMS,
            "execute_no_trans", "entrypoint", NULL } },