From ecc052ba4efd2ee81fac2a35047bbd34a0344aca Mon Sep 17 00:00:00 2001 From: Andrey Markovytch Date: Mon, 8 Jun 2015 11:29:36 +0300 Subject: platform: msm: add Per-File-Tagger (PFT) driver Integrated from msm-3.14. Additional fixes were made to compile with the new kernel and various new warnings and checkpatch issues were fixed Change-Id: I073db1041e41eac9066e37ee099f1da9e4eed6c0 Signed-off-by: Andrey Markovytch [gbroner@codeaurora.org: fixed merge conflict and adapted the LSM security hooks] Signed-off-by: Gilad Broner --- security/selinux/include/objsec.h | 1 + 1 file changed, 1 insertion(+) (limited to 'security/selinux/include/objsec.h') diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 81fa718d5cb3..a6204e701224 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -47,6 +47,7 @@ struct inode_security_struct { u32 sid; /* SID of this object */ u16 sclass; /* security class of this object */ unsigned char initialized; /* initialization flag */ + u32 tag; /* Per-File-Encryption tag */ struct mutex lock; }; -- cgit v1.2.3