diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-10-30 14:07:10 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-10-30 14:07:10 +1100 |
| commit | 50b719f811583a47762ecb7e480d253abc2eb22f (patch) | |
| tree | 290e6cb4f15695140a9dbef1164e69ac9c80e454 /security/smack/smack.h | |
| parent | 3ea7a56067e663278470c04fd655adf809e72d4d (diff) | |
| parent | b5dfd8075bc26636d11c3d8888940198afbf5112 (diff) | |
Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 076b8e8a51ab..364cc64fce71 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -177,9 +177,13 @@ struct smk_port_label { #define SMACK_CIPSO_MAXCATNUM 184 /* 23 * 8 */ /* - * Flag for transmute access + * Flags for untraditional access modes. + * It shouldn't be necessary to avoid conflicts with definitions + * in fs.h, but do so anyway. */ -#define MAY_TRANSMUTE 64 +#define MAY_TRANSMUTE 0x00001000 /* Controls directory labeling */ +#define MAY_LOCK 0x00002000 /* Locks should be writes, but ... */ + /* * Just to make the common cases easier to deal with */ @@ -188,9 +192,9 @@ struct smk_port_label { #define MAY_NOT 0 /* - * Number of access types used by Smack (rwxat) + * Number of access types used by Smack (rwxatl) */ -#define SMK_NUM_ACCESS_TYPE 5 +#define SMK_NUM_ACCESS_TYPE 6 /* SMACK data */ struct smack_audit_data { |