diff options
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 */ |