aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMimi Zohar2012-12-05 08:29:09 -0600
committerMimi Zohar2013-01-22 15:10:34 -0600
commitf578c08ec959cb0cdadf02bdc9689a4df3e9b9d4 (patch)
tree914edd29a01e55aa993f810246ff01e8c1c19ae0 /security/integrity
parent0e5a247cb37a97d843ef76d09d5f80deb7893ba3 (diff)
downloadam43-linux-kernel-f578c08ec959cb0cdadf02bdc9689a4df3e9b9d4.tar.gz
am43-linux-kernel-f578c08ec959cb0cdadf02bdc9689a4df3e9b9d4.tar.xz
am43-linux-kernel-f578c08ec959cb0cdadf02bdc9689a4df3e9b9d4.zip
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 @@
16#include <crypto/sha.h> 16#include <crypto/sha.h>
17 17
18/* iint action cache flags */ 18/* iint action cache flags */
19#define IMA_MEASURE 0x0001 19#define IMA_MEASURE 0x00000001
20#define IMA_MEASURED 0x0002 20#define IMA_MEASURED 0x00000002
21#define IMA_APPRAISE 0x0004 21#define IMA_APPRAISE 0x00000004
22#define IMA_APPRAISED 0x0008 22#define IMA_APPRAISED 0x00000008
23/*#define IMA_COLLECT 0x0010 do not use this flag */ 23/*#define IMA_COLLECT 0x00000010 do not use this flag */
24#define IMA_COLLECTED 0x0020 24#define IMA_COLLECTED 0x00000020
25#define IMA_AUDIT 0x0040 25#define IMA_AUDIT 0x00000040
26#define IMA_AUDITED 0x0080 26#define IMA_AUDITED 0x00000080
27 27
28/* iint cache flags */ 28/* iint cache flags */
29#define IMA_ACTION_FLAGS 0xff00 29#define IMA_ACTION_FLAGS 0xff000000
30#define IMA_DIGSIG 0x0100 30#define IMA_DIGSIG 0x01000000
31#define IMA_DIGSIG_REQUIRED 0x0200 31#define IMA_DIGSIG_REQUIRED 0x02000000
32 32
33#define IMA_DO_MASK (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT) 33#define IMA_DO_MASK (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT)
34#define IMA_DONE_MASK (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED \ 34#define IMA_DONE_MASK (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED \
@@ -50,7 +50,7 @@ struct integrity_iint_cache {
50 struct rb_node rb_node; /* rooted in integrity_iint_tree */ 50 struct rb_node rb_node; /* rooted in integrity_iint_tree */
51 struct inode *inode; /* back pointer to inode in question */ 51 struct inode *inode; /* back pointer to inode in question */
52 u64 version; /* track inode changes */ 52 u64 version; /* track inode changes */
53 unsigned short flags; 53 unsigned long flags;
54 struct evm_ima_xattr_data ima_xattr; 54 struct evm_ima_xattr_data ima_xattr;
55 enum integrity_status ima_status:4; 55 enum integrity_status ima_status:4;
56 enum integrity_status evm_status:4; 56 enum integrity_status evm_status:4;