1 files changed, 27 insertions, 0 deletions

diff --git a/security/security.c b/security/security.c
index f9a2f2ef2454..3724029d0f6d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -136,11 +136,23 @@ int __init register_security(struct security_operations *ops)
 
 int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
 {
+#ifdef CONFIG_SECURITY_YAMA_STACKED
+        int rc;
+        rc = yama_ptrace_access_check(child, mode);
+        if (rc)
+                return rc;
+#endif
         return security_ops->ptrace_access_check(child, mode);
 }
 
 int security_ptrace_traceme(struct task_struct *parent)
 {
+#ifdef CONFIG_SECURITY_YAMA_STACKED
+        int rc;
+        rc = yama_ptrace_traceme(parent);
+        if (rc)
+                return rc;
+#endif
         return security_ops->ptrace_traceme(parent);
 }
 
@@ -561,6 +573,9 @@ int security_inode_setxattr(struct dentry *dentry, const char *name,
         ret = security_ops->inode_setxattr(dentry, name, value, size, flags);
         if (ret)
                 return ret;
+        ret = ima_inode_setxattr(dentry, name, value, size);
+        if (ret)
+                return ret;
         return evm_inode_setxattr(dentry, name, value, size);
 }
 
@@ -596,6 +611,9 @@ int security_inode_removexattr(struct dentry *dentry, const char *name)
         ret = security_ops->inode_removexattr(dentry, name);
         if (ret)
                 return ret;
+        ret = ima_inode_removexattr(dentry, name);
+        if (ret)
+                return ret;
         return evm_inode_removexattr(dentry, name);
 }
 
@@ -761,6 +779,9 @@ int security_task_create(unsigned long clone_flags)
 
 void security_task_free(struct task_struct *task)
 {
+#ifdef CONFIG_SECURITY_YAMA_STACKED
+        yama_task_free(task);
+#endif
         security_ops->task_free(task);
 }
 
@@ -876,6 +897,12 @@ int security_task_wait(struct task_struct *p)
 int security_task_prctl(int option, unsigned long arg2, unsigned long arg3,
                          unsigned long arg4, unsigned long arg5)
 {
+#ifdef CONFIG_SECURITY_YAMA_STACKED
+        int rc;
+        rc = yama_task_prctl(option, arg2, arg3, arg4, arg5);
+        if (rc != -ENOSYS)
+                return rc;
+#endif
         return security_ops->task_prctl(option, arg2, arg3, arg4, arg5);
 }