Browse Source

Yama: consolidate error reporting

Use a common error reporting function for Yama violation reports, and give
more detail into the process command lines.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Kees Cook 9 năm trước cách đây
mục cha
commit
8a56038c2a
1 tập tin đã thay đổi với 21 bổ sung10 xóa
  1. 21 10
      security/yama/yama_lsm.c

+ 21 - 10
security/yama/yama_lsm.c

@@ -18,6 +18,7 @@
 #include <linux/prctl.h>
 #include <linux/prctl.h>
 #include <linux/ratelimit.h>
 #include <linux/ratelimit.h>
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
+#include <linux/string_helpers.h>
 
 
 #define YAMA_SCOPE_DISABLED	0
 #define YAMA_SCOPE_DISABLED	0
 #define YAMA_SCOPE_RELATIONAL	1
 #define YAMA_SCOPE_RELATIONAL	1
@@ -41,6 +42,22 @@ static DEFINE_SPINLOCK(ptracer_relations_lock);
 static void yama_relation_cleanup(struct work_struct *work);
 static void yama_relation_cleanup(struct work_struct *work);
 static DECLARE_WORK(yama_relation_work, yama_relation_cleanup);
 static DECLARE_WORK(yama_relation_work, yama_relation_cleanup);
 
 
+static void report_access(const char *access, struct task_struct *target,
+			  struct task_struct *agent)
+{
+	char *target_cmd, *agent_cmd;
+
+	target_cmd = kstrdup_quotable_cmdline(target, GFP_KERNEL);
+	agent_cmd = kstrdup_quotable_cmdline(agent, GFP_KERNEL);
+
+	pr_notice_ratelimited(
+		"ptrace %s of \"%s\"[%d] was attempted by \"%s\"[%d]\n",
+		access, target_cmd, target->pid, agent_cmd, agent->pid);
+
+	kfree(agent_cmd);
+	kfree(target_cmd);
+}
+
 /**
 /**
  * yama_relation_cleanup - remove invalid entries from the relation list
  * yama_relation_cleanup - remove invalid entries from the relation list
  *
  *
@@ -307,11 +324,8 @@ static int yama_ptrace_access_check(struct task_struct *child,
 		}
 		}
 	}
 	}
 
 
-	if (rc && (mode & PTRACE_MODE_NOAUDIT) == 0) {
-		printk_ratelimited(KERN_NOTICE
-			"ptrace of pid %d was attempted by: %s (pid %d)\n",
-			child->pid, current->comm, current->pid);
-	}
+	if (rc && (mode & PTRACE_MODE_NOAUDIT) == 0)
+		report_access("attach", child, current);
 
 
 	return rc;
 	return rc;
 }
 }
@@ -337,11 +351,8 @@ int yama_ptrace_traceme(struct task_struct *parent)
 		break;
 		break;
 	}
 	}
 
 
-	if (rc) {
-		printk_ratelimited(KERN_NOTICE
-			"ptraceme of pid %d was attempted by: %s (pid %d)\n",
-			current->pid, parent->comm, parent->pid);
-	}
+	if (rc)
+		report_access("traceme", current, parent);
 
 
 	return rc;
 	return rc;
 }
 }