summaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorDmitry Kasatkin <dmitry.kasatkin@intel.com>2012-09-19 15:32:49 +0300
committerMimi Zohar <zohar@linux.vnet.ibm.com>2012-09-19 08:55:20 -0400
commit0a72ba7aff26fb6e918cee6d2bbfd289069f10ae (patch)
tree4263886ae20b6875153c20513b607e6208e8a3f6 /security/integrity
parent46a2f3b9e99353cc63e15563e8abee71162330f7 (diff)
downloadlinux-3.10-0a72ba7aff26fb6e918cee6d2bbfd289069f10ae.tar.gz
linux-3.10-0a72ba7aff26fb6e918cee6d2bbfd289069f10ae.tar.bz2
linux-3.10-0a72ba7aff26fb6e918cee6d2bbfd289069f10ae.zip
ima: change flags container data type
IMA audit hashes patches introduced new IMA flags and required space went beyond 8 bits. Currently the only flag is IMA_DIGSIG. This patch use 16 bit short instead of 8 bit char. Without this fix IMA signature will be replaced with hash, which should not happen. Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/integrity.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 403ba319a06..e9db763a875 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -48,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;