diff options
| author | Andrey Markovytch <andreym@codeaurora.org> | 2015-06-08 14:04:45 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:24:06 -0700 |
| commit | 584531e72e48d4ef1403eaac82fa85be2135f5c7 (patch) | |
| tree | 295e22e5ef3b2b4588aafce854c75c96b53fae5f /security/selinux/hooks.c | |
| parent | 5eebf863430b86333cb3e0c179cc5d7b1f0deb0f (diff) | |
PFK: new module to work with ecryptfs
PFK is a new module that accompanies eCryptfs and
enables it to utilize ICE hw encryption engine. Module
is responsible for storing encryption/decryption keys
inside eCryptfs inodes for each file and loading them
to ICE
Change-Id: I6e755ca657164919147fe0d9482477e14a4be5eb
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
[gbroner@codeaurora.org: fix merge conflicts, adapted LSM hooks
and added missing qseecom headers to fix compilation]
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index a00bb5f9fcde..e17c4a7c62d5 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -84,6 +84,7 @@ #include <linux/msg.h> #include <linux/shm.h> #include <linux/pft.h> +#include <linux/pfk.h> #include "avc.h" #include "objsec.h" @@ -3585,7 +3586,8 @@ static int selinux_file_close(struct file *file) static bool selinux_allow_merge_bio(struct bio *bio1, struct bio *bio2) { - return pft_allow_merge_bio(bio1, bio2); + return pft_allow_merge_bio(bio1, bio2) && + pfk_allow_merge_bio(bio1, bio2); } /* task security operations */ |