Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / security / integrity / integrity.h

diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 4eec1b1..e9db763 100644 (file)
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -15,13 +15,22 @@
 #include <linux/integrity.h>
 #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
+
 /* iint cache flags */
-#define IMA_MEASURE            0x01
-#define IMA_MEASURED           0x02
-#define IMA_APPRAISE           0x04
-#define IMA_APPRAISED          0x08
-#define IMA_COLLECTED          0x10
-#define IMA_DIGSIG             0x20
+#define IMA_DIGSIG             0x0100
+
+#define IMA_DO_MASK            (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT)
+#define IMA_DONE_MASK          (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED \
+                                | IMA_COLLECTED)
 
 enum evm_ima_xattr_type {
        IMA_XATTR_DIGEST = 0x01,
@@ -39,7 +48,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 char flags;
+       unsigned short flags;
        struct evm_ima_xattr_data ima_xattr;
        enum integrity_status ima_status;
        enum integrity_status evm_status;