diff options
| author | Andrey Markovytch <andreym@codeaurora.org> | 2017-01-09 11:23:03 +0200 |
|---|---|---|
| committer | Andrey Markovytch <andreym@codeaurora.org> | 2017-01-09 11:23:03 +0200 |
| commit | 3eab9b61f3c0d660a89039b5dabbc7f31458af6f (patch) | |
| tree | ad4e305ea6ea42a76422b9cf6a699321598322c8 /security/pfe/pft.c | |
| parent | 33eba0ae11ee6a1a9cef3969132e637724a780be (diff) | |
security: switched to stackable model for PFT/PFK module
Moved hooks from SELINUX framework to general SECURITY framework.
Change-Id: I37e701b4925c4993f724c32b258c5088f4dcbe4d
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
Diffstat (limited to 'security/pfe/pft.c')
| -rw-r--r-- | security/pfe/pft.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/security/pfe/pft.c b/security/pfe/pft.c index 74433c4fe0ff..0c49fbdd4f28 100644 --- a/security/pfe/pft.c +++ b/security/pfe/pft.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -199,8 +199,6 @@ static struct security_hook_list pft_hooks[] = { LSM_HOOK_INIT(file_open, pft_file_open), LSM_HOOK_INIT(file_permission, pft_file_permission), LSM_HOOK_INIT(file_close, pft_file_close), - - LSM_HOOK_INIT(allow_merge_bio, pft_allow_merge_bio), }; static int __init pft_lsm_init(struct pft_device *dev) @@ -211,7 +209,8 @@ static int __init pft_lsm_init(struct pft_device *dev) dev->is_chosen_lsm = true; pr_debug("pft is the chosen lsm, registered successfully !\n"); } else { - pr_debug("pft is not the chosen lsm.\n"); + pr_err("pft is not the chosen lsm\n"); + return -ENODEV; } return 0; |