Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[sfrench/cifs-2.6.git] / security / integrity / integrity.h

diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 45f4aef83e29e89576221e18e4ec7b09d0f66c20..875c6a7a5af1a63113e838d86caa7112274cd77a 100644 (file)
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -76,6 +76,12 @@ enum evm_ima_xattr_type {
 
 struct evm_ima_xattr_data {
        u8 type;
+       u8 data[];
+} __packed;
+
+/* Only used in the EVM HMAC code. */
+struct evm_xattr {
+       struct evm_ima_xattr_data data;
        u8 digest[SHA1_DIGEST_SIZE];
 } __packed;