aboutsummaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2012-12-05 09:29:09 -0500
committerMimi Zohar <zohar@linux.vnet.ibm.com>2013-01-22 16:10:34 -0500
commitf578c08ec959cb0cdadf02bdc9689a4df3e9b9d4 (patch)
tree914edd29a01e55aa993f810246ff01e8c1c19ae0 /security/integrity
parent0e5a247cb37a97d843ef76d09d5f80deb7893ba3 (diff)
downloadvexpress-lsk-f578c08ec959cb0cdadf02bdc9689a4df3e9b9d4.tar.gz
ima: increase iint flag size
In preparation for hook specific appraise status results, increase the iint flags size. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/integrity.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 9334691b2b7..329ad263e13 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -16,19 +16,19 @@
#include <crypto/sha.h>
/* iint action cache flags */
-#define IMA_MEASURE 0x0001
-#define IMA_MEASURED 0x0002
-#define IMA_APPRAISE 0x0004
-#define IMA_APPRAISED 0x0008
-/*#define IMA_COLLECT 0x0010 do not use this flag */
-#define IMA_COLLECTED 0x0020
-#define IMA_AUDIT 0x0040
-#define IMA_AUDITED 0x0080
+#define IMA_MEASURE 0x00000001
+#define IMA_MEASURED 0x00000002
+#define IMA_APPRAISE 0x00000004
+#define IMA_APPRAISED 0x00000008
+/*#define IMA_COLLECT 0x00000010 do not use this flag */
+#define IMA_COLLECTED 0x00000020
+#define IMA_AUDIT 0x00000040
+#define IMA_AUDITED 0x00000080
/* iint cache flags */
-#define IMA_ACTION_FLAGS 0xff00
-#define IMA_DIGSIG 0x0100
-#define IMA_DIGSIG_REQUIRED 0x0200
+#define IMA_ACTION_FLAGS 0xff000000
+#define IMA_DIGSIG 0x01000000
+#define IMA_DIGSIG_REQUIRED 0x02000000
#define IMA_DO_MASK (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT)
#define IMA_DONE_MASK (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED \
@@ -50,7 +50,7 @@ struct integrity_iint_cache {
struct rb_node rb_node; /* rooted in integrity_iint_tree */
struct inode *inode; /* back pointer to inode in question */
u64 version; /* track inode changes */
- unsigned short flags;
+ unsigned long flags;
struct evm_ima_xattr_data ima_xattr;
enum integrity_status ima_status:4;
enum integrity_status evm_status:4;