Add static DTrace probes for MAC Framework access control checks and

privilege grants so that dtrace can be more easily used to monitor
the security decisions being generated by the MAC Framework following
policy invocation.

Successful access control checks will be reported by:

  mac_framework:kernel:<entrypoint>:mac_check_ok

Failed access control checks will be reported by:

  mac_framework:kernel:<entrypoint>:mac_check_err

Successful privilege grants will be reported by:

  mac_framework:kernel:priv_grant:mac_grant_ok

Failed privilege grants will be reported by:

  mac_framework:kernel:priv_grant:mac_grant_err

In all cases, the return value (always 0 for _ok, otherwise an errno
for _err) will be reported via arg0 on the probe, and subsequent
arguments will hold entrypoint-specific data, in a style similar to
privilege tracing.

Obtained from:	TrustedBSD Project
Sponsored by:	Google, Inc.

1 files changed, 46 insertions, 1 deletions

diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 588e0191c027..a8e351ea1382 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
  * Copyright (c) 2006 SPARTA, Inc.
- * Copyright (c) 2007 Robert N. M. Watson
+ * Copyright (c) 2007, 2009 Robert N. M. Watson
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project in part by Network
@@ -15,6 +15,9 @@
  * This software was enhanced by SPARTA ISSO under SPAWAR contract
  * N66001-04-C-6019 ("SEFOS").
  *
+ * This software was developed at the University of Cambridge Computer
+ * Laboratory with support from a grant from Google, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -50,6 +53,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
@@ -58,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/sdt.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>
@@ -66,46 +71,61 @@ __FBSDID("$FreeBSD$");
 #include <security/mac/mac_internal.h>
 #include <security/mac/mac_policy.h>
 
+MAC_CHECK_PROBE_DEFINE1(kenv_check_dump, "struct ucred *");
+
 int
 mac_kenv_check_dump(struct ucred *cred)
 {
 	int error;
 
 	MAC_CHECK(kenv_check_dump, cred);
+	MAC_CHECK_PROBE1(kenv_check_dump, error, cred);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(kenv_check_get, "struct ucred *", "char *");
+
 int
 mac_kenv_check_get(struct ucred *cred, char *name)
 {
 	int error;
 
 	MAC_CHECK(kenv_check_get, cred, name);
+	MAC_CHECK_PROBE2(kenv_check_get, error, cred, name);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE3(kenv_check_set, "struct ucred *", "char *",
+    "char *");
+
 int
 mac_kenv_check_set(struct ucred *cred, char *name, char *value)
 {
 	int error;
 
 	MAC_CHECK(kenv_check_set, cred, name, value);
+	MAC_CHECK_PROBE3(kenv_check_set, error, cred, name, value);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(kenv_check_unset, "struct ucred *", "char *");
+
 int
 mac_kenv_check_unset(struct ucred *cred, char *name)
 {
 	int error;
 
 	MAC_CHECK(kenv_check_unset, cred, name);
+	MAC_CHECK_PROBE2(kenv_check_unset, error, cred, name);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(kld_check_load, "struct ucred *", "struct vnode *");
+
 int
 mac_kld_check_load(struct ucred *cred, struct vnode *vp)
 {
@@ -114,20 +134,27 @@ mac_kld_check_load(struct ucred *cred, struct vnode *vp)
 	ASSERT_VOP_LOCKED(vp, "mac_kld_check_load");
 
 	MAC_CHECK(kld_check_load, cred, vp, vp->v_label);
+	MAC_CHECK_PROBE2(kld_check_load, error, cred, vp);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE1(kld_check_stat, "struct ucred *");
+
 int
 mac_kld_check_stat(struct ucred *cred)
 {
 	int error;
 
 	MAC_CHECK(kld_check_stat, cred);
+	MAC_CHECK_PROBE1(kld_check_stat, error, cred);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(system_check_acct, "struct ucred *",
+    "struct vnode *");
+
 int
 mac_system_check_acct(struct ucred *cred, struct vnode *vp)
 {
@@ -139,20 +166,27 @@ mac_system_check_acct(struct ucred *cred, struct vnode *vp)
 
 	MAC_CHECK(system_check_acct, cred, vp,
 	    vp != NULL ? vp->v_label : NULL);
+	MAC_CHECK_PROBE2(system_check_acct, error, cred, vp);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(system_check_reboot, "struct ucred *", "int");
+
 int
 mac_system_check_reboot(struct ucred *cred, int howto)
 {
 	int error;
 
 	MAC_CHECK(system_check_reboot, cred, howto);
+	MAC_CHECK_PROBE2(system_check_reboot, error, cred, howto);
 
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(system_check_swapon, "struct ucred *",
+    "struct vnode *");
+
 int
 mac_system_check_swapon(struct ucred *cred, struct vnode *vp)
 {
@@ -161,9 +195,14 @@ mac_system_check_swapon(struct ucred *cred, struct vnode *vp)
 	ASSERT_VOP_LOCKED(vp, "mac_system_check_swapon");
 
 	MAC_CHECK(system_check_swapon, cred, vp, vp->v_label);
+	MAC_CHECK_PROBE2(system_check_swapon, error, cred, vp);
+
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE2(system_check_swapoff, "struct ucred *",
+    "struct vnode *");
+
 int
 mac_system_check_swapoff(struct ucred *cred, struct vnode *vp)
 {
@@ -172,9 +211,14 @@ mac_system_check_swapoff(struct ucred *cred, struct vnode *vp)
 	ASSERT_VOP_LOCKED(vp, "mac_system_check_swapoff");
 
 	MAC_CHECK(system_check_swapoff, cred, vp, vp->v_label);
+	MAC_CHECK_PROBE2(system_check_swapoff, error, cred, vp);
+
 	return (error);
 }
 
+MAC_CHECK_PROBE_DEFINE3(system_check_sysctl, "struct ucred *",
+    "struct sysctl_oid *", "struct sysctl_req *");
+
 int
 mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
     void *arg1, int arg2, struct sysctl_req *req)
@@ -186,6 +230,7 @@ mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
 	 * but since it's not exported from kern_sysctl.c, we can't.
 	 */
 	MAC_CHECK(system_check_sysctl, cred, oidp, arg1, arg2, req);
+	MAC_CHECK_PROBE3(system_check_sysctl, error, cred, oidp, req);
 
 	return (error);
 }