diff options
author | Jarkko Sakkinen <jarkko.sakkinen@iki.fi> | 2012-11-06 03:17:49 -0500 |
---|---|---|
committer | Casey Schaufler <casey@schaufler-ca.com> | 2013-03-19 17:16:15 -0400 |
commit | cee7e443344a3845e5b9111614b41e0b1afb60ce (patch) | |
tree | 5f2f11bc5d1f25b7dd37517e9763a9b0449cffe8 | |
parent | a87d79ad7cfa299aa14bb22758313dec33909875 (diff) |
smack: SMACK_MAGIC to include/uapi/linux/magic.h
SMACK_MAGIC moved to a proper place for easy user space access
(i.e. libsmack).
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
-rw-r--r-- | include/uapi/linux/magic.h | 1 | ||||
-rw-r--r-- | security/smack/smack.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 873e086ce3a1..249df3720be2 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define DEBUGFS_MAGIC 0x64626720 | 11 | #define DEBUGFS_MAGIC 0x64626720 |
12 | #define SECURITYFS_MAGIC 0x73636673 | 12 | #define SECURITYFS_MAGIC 0x73636673 |
13 | #define SELINUX_MAGIC 0xf97cff8c | 13 | #define SELINUX_MAGIC 0xf97cff8c |
14 | #define SMACK_MAGIC 0x43415d53 /* "SMAC" */ | ||
14 | #define RAMFS_MAGIC 0x858458f6 /* some random number */ | 15 | #define RAMFS_MAGIC 0x858458f6 /* some random number */ |
15 | #define TMPFS_MAGIC 0x01021994 | 16 | #define TMPFS_MAGIC 0x01021994 |
16 | #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ | 17 | #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ |
diff --git a/security/smack/smack.h b/security/smack/smack.h index 99b36124f712..8ad30955e15d 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h | |||
@@ -149,11 +149,6 @@ struct smack_known { | |||
149 | #define SMACK_CIPSO_SOCKET 1 | 149 | #define SMACK_CIPSO_SOCKET 1 |
150 | 150 | ||
151 | /* | 151 | /* |
152 | * smackfs magic number | ||
153 | */ | ||
154 | #define SMACK_MAGIC 0x43415d53 /* "SMAC" */ | ||
155 | |||
156 | /* | ||
157 | * CIPSO defaults. | 152 | * CIPSO defaults. |
158 | */ | 153 | */ |
159 | #define SMACK_CIPSO_DOI_DEFAULT 3 /* Historical */ | 154 | #define SMACK_CIPSO_DOI_DEFAULT 3 /* Historical */ |