diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-24 11:21:25 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-24 11:21:25 +1100 |
| commit | 0821e30cd2f246a93c5271f6c23d7134f809d70d (patch) | |
| tree | c2f62952279ebd70df908b3d4e0fabb50082d97f /security/selinux/include | |
| parent | b075361e91684f8b9d4a85ad2e6f62f94d6698e3 (diff) | |
| parent | 9287aed2ad1ff1bde5eb190bcd6dccd5f1cf47d3 (diff) | |
| download | linux-0821e30cd2f246a93c5271f6c23d7134f809d70d.tar.gz | |
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/include')
| -rw-r--r-- | security/selinux/include/classmap.h | 4 | ||||
| -rw-r--r-- | security/selinux/include/objsec.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 1f1f4b2f6018..e2d4ad3a4b4c 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -24,6 +24,10 @@ #define COMMON_CAP2_PERMS "mac_override", "mac_admin", "syslog", \ "wake_alarm", "block_suspend", "audit_read" +#if CAP_LAST_CAP > CAP_AUDIT_READ +#error New capability defined, please update COMMON_CAP2_PERMS. +#endif + /* * Note: The name for any socket class should be suffixed by "socket", * and doesn't contain more than one substr of "socket". diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index c21e135460a5..e8dab0f02c72 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -39,7 +39,8 @@ struct task_security_struct { enum label_initialized { LABEL_INVALID, /* invalid or not initialized */ - LABEL_INITIALIZED /* initialized */ + LABEL_INITIALIZED, /* initialized */ + LABEL_PENDING }; struct inode_security_struct { @@ -52,7 +53,7 @@ struct inode_security_struct { u32 sid; /* SID of this object */ u16 sclass; /* security class of this object */ unsigned char initialized; /* initialization flag */ - struct mutex lock; + spinlock_t lock; }; struct file_security_struct { |